← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to cmd/juju/upgradejuju.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/juju/upgradejuju.go
6
6
        "launchpad.net/juju-core/cmd"
7
7
        "launchpad.net/juju-core/environs"
8
8
        "launchpad.net/juju-core/environs/config"
 
9
        "launchpad.net/juju-core/environs/tools"
9
10
        "launchpad.net/juju-core/juju"
10
11
        "launchpad.net/juju-core/state"
11
12
        "launchpad.net/juju-core/version"
24
25
        vers         string
25
26
}
26
27
 
27
 
var putTools = environs.PutTools
 
28
var uploadTools = tools.Upload
28
29
 
29
30
func (c *UpgradeJujuCommand) Info() *cmd.Info {
30
31
        return &cmd.Info{
78
79
                if c.BumpVersion {
79
80
                        vers := c.bumpedVersion()
80
81
                        forceVersion = &vers.Number
81
 
                        c.Version = vers.Number
82
82
                }
83
 
                tools, err := putTools(c.conn.Environ.Storage(), forceVersion)
 
83
                tools, err := uploadTools(c.conn.Environ.Storage(), forceVersion)
84
84
                if err != nil {
85
85
                        return err
86
86
                }
87
 
                c.toolsList.Private = append(c.toolsList.Private, tools)
88
 
        }
89
 
        if c.Version == (version.Number{}) {
 
87
                c.Version = tools.Number
 
88
        } else if c.Version == (version.Number{}) {
90
89
                c.Version, err = c.newestVersion()
91
90
                if err != nil {
92
91
                        return fmt.Errorf("cannot find newest version: %v", err)