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 "fmt" | 7 "fmt" |
8 | 8 |
9 "launchpad.net/gnuflag" | 9 "launchpad.net/gnuflag" |
10 | 10 |
(...skipping 29 matching lines...) Expand all Loading... |
40 if !names.IsUnit(c.UnitName) { | 40 if !names.IsUnit(c.UnitName) { |
41 return fmt.Errorf("invalid unit name %q", c.UnitName) | 41 return fmt.Errorf("invalid unit name %q", c.UnitName) |
42 } | 42 } |
43 args = args[1:] | 43 args = args[1:] |
44 } else { | 44 } else { |
45 return fmt.Errorf("no unit specified") | 45 return fmt.Errorf("no unit specified") |
46 } | 46 } |
47 return cmd.CheckEmpty(args) | 47 return cmd.CheckEmpty(args) |
48 } | 48 } |
49 | 49 |
50 func (c *ResolvedCommand) Run(_ *cmd.Context) error { | 50 func (c *ResolvedCommand) Run(ctx *cmd.Context) (err error) { |
51 conn, err := juju.NewConnFromName(c.EnvName) | 51 conn, err := juju.NewConnFromName(c.EnvName) |
52 if err != nil { | 52 if err != nil { |
53 return err | 53 return err |
54 } | 54 } |
55 defer conn.Close() | 55 defer conn.Close() |
56 unit, err := conn.State.Unit(c.UnitName) | 56 unit, err := conn.State.Unit(c.UnitName) |
57 if err != nil { | 57 if err != nil { |
58 return err | 58 return err |
59 } | 59 } |
60 return unit.Resolve(c.Retry) | 60 return unit.Resolve(c.Retry) |
61 } | 61 } |
OLD | NEW |