| OLD | NEW |
|---|
| 1 package main | 1 package main |
| 2 | 2 |
| 3 import ( | 3 import ( |
| 4 "fmt" | 4 "fmt" |
| 5 "launchpad.net/gnuflag" | 5 "launchpad.net/gnuflag" |
| 6 "launchpad.net/juju-core/cmd" | 6 "launchpad.net/juju-core/cmd" |
| 7 "launchpad.net/juju-core/log" | 7 "launchpad.net/juju-core/log" |
| 8 "launchpad.net/juju-core/state" | 8 "launchpad.net/juju-core/state" |
| 9 "regexp" | 9 "regexp" |
| 10 "strings" | 10 "strings" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 continue | 119 continue |
| 120 } | 120 } |
| 121 if err := t.Wait(); err != nil { | 121 if err := t.Wait(); err != nil { |
| 122 log.Printf("%s: %v", tasks[i], err) | 122 log.Printf("%s: %v", tasks[i], err) |
| 123 } | 123 } |
| 124 } | 124 } |
| 125 return chosen.err | 125 return chosen.err |
| 126 } | 126 } |
| 127 | 127 |
| 128 func isUpgraded(err error) bool { | 128 func isUpgraded(err error) bool { |
| 129 » _, ok := err.(*UpgradedError) | 129 » _, ok := err.(*UpgradeReadyError) |
| 130 return ok | 130 return ok |
| 131 } | 131 } |
| OLD | NEW |
|---|
