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

Side by Side Diff: cmd/juju/addunit.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 "errors" 7 "errors"
8 "fmt" 8 "fmt"
9 9
10 "launchpad.net/gnuflag" 10 "launchpad.net/gnuflag"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 return errors.New("no service specified") 81 return errors.New("no service specified")
82 } 82 }
83 if err := cmd.CheckEmpty(args[1:]); err != nil { 83 if err := cmd.CheckEmpty(args[1:]); err != nil {
84 return err 84 return err
85 } 85 }
86 return c.UnitCommandBase.Init(args) 86 return c.UnitCommandBase.Init(args)
87 } 87 }
88 88
89 // Run connects to the environment specified on the command line 89 // Run connects to the environment specified on the command line
90 // and calls conn.AddUnits. 90 // and calls conn.AddUnits.
91 func (c *AddUnitCommand) Run(_ *cmd.Context) error { 91 func (c *AddUnitCommand) Run(ctx *cmd.Context) (err error) {
rog 2013/08/08 17:25:41 ditto
92 conn, err := juju.NewConnFromName(c.EnvName) 92 conn, err := juju.NewConnFromName(c.EnvName)
93 if err != nil { 93 if err != nil {
94 return err 94 return err
95 } 95 }
96 defer conn.Close() 96 defer conn.Close()
97 97
98 params := params.AddServiceUnits{ 98 params := params.AddServiceUnits{
99 ServiceName: c.ServiceName, 99 ServiceName: c.ServiceName,
100 NumUnits: c.NumUnits, 100 NumUnits: c.NumUnits,
101 ToMachineSpec: c.ToMachineSpec, 101 ToMachineSpec: c.ToMachineSpec,
102 } 102 }
103 _, err = statecmd.AddServiceUnits(conn.State, params) 103 _, err = statecmd.AddServiceUnits(conn.State, params)
104 return err 104 return err
105 } 105 }
OLDNEW

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