← Back to branch summary

~cmars/juju-core/ecdsa-tls

« back to all changes in this revision

Viewing changes to cmd/plugins/juju-metadata/validateimagemetadata.go

  • Committer: Casey Marshall
  • Date: 2014-05-13 17:54:45 UTC
  • mfrom: (2714.2.12 juju-core)
  • Revision ID: cmars@cmarstech.com-20140513175445-xakbd46xcsat5nr4
Fast-forward merge w/lp:juju-core.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/plugins/juju-metadata/validateimagemetadata.go
81
81
}
82
82
 
83
83
func (c *ValidateImageMetadataCommand) SetFlags(f *gnuflag.FlagSet) {
84
 
        c.EnvCommandBase.SetFlags(f)
85
84
        c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
86
85
        f.StringVar(&c.providerType, "p", "", "the provider type eg ec2, openstack")
87
86
        f.StringVar(&c.metadataDir, "d", "", "directory where metadata files are found")
92
91
}
93
92
 
94
93
func (c *ValidateImageMetadataCommand) Init(args []string) error {
95
 
        err := c.EnvCommandBase.Init()
96
 
        if err != nil {
97
 
                return err
98
 
        }
99
94
        if c.providerType != "" {
100
95
                if c.series == "" {
101
96
                        return fmt.Errorf("series required if provider type is specified")
107
102
                        return fmt.Errorf("metadata directory required if provider type is specified")
108
103
                }
109
104
        }
110
 
        return nil
 
105
        return cmd.CheckEmpty(args)
111
106
}
112
107
 
113
108
var _ environs.ConfigGetter = (*overrideEnvStream)(nil)