← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/juju/cloud/defaultcredential.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/cmd/juju/cloud/defaultcredential.go
61
61
}
62
62
 
63
63
func (c *setDefaultCredentialCommand) Run(ctxt *cmd.Context) error {
64
 
        _, err := jujucloud.CloudByName(c.cloud)
65
 
        if err != nil {
 
64
        if _, err := cloudOrProvider(c.cloud, jujucloud.CloudByName); err != nil {
66
65
                return err
67
66
        }
68
 
        var cred *jujucloud.CloudCredential
69
 
        cred, err = c.store.CredentialForCloud(c.cloud)
 
67
        cred, err := c.store.CredentialForCloud(c.cloud)
70
68
        if errors.IsNotFound(err) {
71
69
                cred = &jujucloud.CloudCredential{}
72
70
        } else if err != nil {