OLD | NEW |
1 // Copyright 2012, 2013 Canonical Ltd. | 1 // Copyright 2012, 2013 Canonical Ltd. |
2 // Licensed under the AGPLv3, see LICENCE file for details. | 2 // Licensed under the AGPLv3, see LICENCE file for details. |
3 | 3 |
4 package main | 4 package main |
5 | 5 |
6 import ( | 6 import ( |
7 stderrors "errors" | 7 stderrors "errors" |
8 "fmt" | 8 "fmt" |
| 9 |
9 "launchpad.net/gnuflag" | 10 "launchpad.net/gnuflag" |
| 11 |
10 "launchpad.net/juju-core/agent/tools" | 12 "launchpad.net/juju-core/agent/tools" |
11 "launchpad.net/juju-core/cmd" | 13 "launchpad.net/juju-core/cmd" |
12 "launchpad.net/juju-core/environs" | 14 "launchpad.net/juju-core/environs" |
13 "launchpad.net/juju-core/environs/config" | 15 "launchpad.net/juju-core/environs/config" |
14 "launchpad.net/juju-core/errors" | 16 "launchpad.net/juju-core/errors" |
15 "launchpad.net/juju-core/juju" | 17 "launchpad.net/juju-core/juju" |
16 "launchpad.net/juju-core/log" | 18 "launchpad.net/juju-core/log" |
17 "launchpad.net/juju-core/version" | 19 "launchpad.net/juju-core/version" |
18 ) | 20 ) |
19 | 21 |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 } | 90 } |
89 if len(c.Series) > 0 && !c.UploadTools { | 91 if len(c.Series) > 0 && !c.UploadTools { |
90 return fmt.Errorf("--series requires --upload-tools") | 92 return fmt.Errorf("--series requires --upload-tools") |
91 } | 93 } |
92 return cmd.CheckEmpty(args) | 94 return cmd.CheckEmpty(args) |
93 } | 95 } |
94 | 96 |
95 var errUpToDate = stderrors.New("no upgrades available") | 97 var errUpToDate = stderrors.New("no upgrades available") |
96 | 98 |
97 // Run changes the version proposed for the juju tools. | 99 // Run changes the version proposed for the juju tools. |
98 func (c *UpgradeJujuCommand) Run(_ *cmd.Context) (err error) { | 100 func (c *UpgradeJujuCommand) Run(ctx *cmd.Context) (err error) { |
99 conn, err := juju.NewConnFromName(c.EnvName) | 101 conn, err := juju.NewConnFromName(c.EnvName) |
100 if err != nil { | 102 if err != nil { |
101 return err | 103 return err |
102 } | 104 } |
103 defer conn.Close() | 105 defer conn.Close() |
104 defer func() { | 106 defer func() { |
105 if err == errUpToDate { | 107 if err == errUpToDate { |
106 log.Noticef(err.Error()) | 108 log.Noticef(err.Error()) |
107 err = nil | 109 err = nil |
108 } | 110 } |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 for _, t := range existing { | 273 for _, t := range existing { |
272 if t.Version.Major != vers.Major || t.Version.Minor != vers.Mino
r || t.Version.Patch != vers.Patch { | 274 if t.Version.Major != vers.Major || t.Version.Minor != vers.Mino
r || t.Version.Patch != vers.Patch { |
273 continue | 275 continue |
274 } | 276 } |
275 if t.Version.Build >= vers.Build { | 277 if t.Version.Build >= vers.Build { |
276 vers.Build = t.Version.Build + 1 | 278 vers.Build = t.Version.Build + 1 |
277 } | 279 } |
278 } | 280 } |
279 return vers | 281 return vers |
280 } | 282 } |
OLD | NEW |