Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(280)

Side by Side Diff: cmd/juju/resolved.go

Issue 12546043: return error on no environment
Patch Set: return error on no environment Created 10 years, 7 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
OLDNEW
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
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) {
rog 2013/08/08 17:25:41 same
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 }
OLDNEW

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b