Fix ServiceDeploy panic when called via the API.

cmd/juju/main.go

 package main
 
 import (
         "fmt"
         "launchpad.net/juju-core/cmd"
         "launchpad.net/juju-core/juju"
         "os"
 )
 
 // When we import an environment provider implementation
 // here, it will register itself with environs, and hence
 // be available to the juju command.
 import (
         _ "launchpad.net/juju-core/environs/ec2"
         _ "launchpad.net/juju-core/environs/openstack"
 )
 
 var jujuDoc = `
 juju provides easy, intelligent service orchestration on top of environments
 such as OpenStack, Amazon AWS, or bare metal.
 
 https://juju.ubuntu.com/
 `
 
 // Main registers subcommands for the juju executable, and hands over control
 // to the cmd package. This function is not redundant with main, because it
 // provides an entry point for testing with arbitrary command line arguments.
 func Main(args []string) {
         if err := juju.InitJujuHome(); err != nil {
-                fmt.Fprintf(os.Stderr, "command failed: "+err.Error()+"\n")

[rog, 2013/04/09 16:22:59]

fmt.Fprintf(os.Stderr, "error: %s\n", err)

to be consistent with cmd.Main

in general passing a non-constant argument to Fprintf-like functions is not a
good idea regardless.

[frankban, 2013/04/09 16:43:23]

Done.

-                os.Exit(1)

[rog, 2013/04/09 16:22:59]

i know it was like this before, but i think this should probably be os.Exit(2).

[frankban, 2013/04/09 16:43:23]

Done.

+                fmt.Fprintf(os.Stderr, "error: %s\n", err)
+                os.Exit(2)
         }
         juju := cmd.NewSuperCommand(cmd.SuperCommandParams{
                 Name: "juju",
                 Doc:  jujuDoc,
                 Log:  &cmd.Log{},
         })
         juju.AddHelpTopic("basics", "Basic commands", helpBasics)
 
-        // Register creation commands.
+        // Creation commands.
         juju.Register(&BootstrapCommand{})
         juju.Register(&DeployCommand{})
         juju.Register(&AddRelationCommand{})
         juju.Register(&AddUnitCommand{})
 
-        // Register destruction commands.
+        // Destruction commands.
         juju.Register(&DestroyMachineCommand{})
         juju.Register(&DestroyRelationCommand{})
         juju.Register(&DestroyServiceCommand{})
         juju.Register(&DestroyUnitCommand{})
         juju.Register(&DestroyEnvironmentCommand{})
 
-        // Register error resolution commands.
+        // Error resolution commands.
         juju.Register(&StatusCommand{})
         juju.Register(&SCPCommand{})
         juju.Register(&SSHCommand{})
         juju.Register(&ResolvedCommand{})
         juju.Register(&DebugLogCommand{sshCmd: &SSHCommand{}})
 
-        // Register configuration commands.
+        // Configuration commands.
         juju.Register(&InitCommand{})
         juju.Register(&GetCommand{})
         juju.Register(&SetCommand{})
         juju.Register(&GetConstraintsCommand{})
         juju.Register(&SetConstraintsCommand{})
         juju.Register(&ExposeCommand{})
         juju.Register(&SyncToolsCommand{})
         juju.Register(&UnexposeCommand{})
         juju.Register(&UpgradeJujuCommand{})
         juju.Register(&UpgradeCharmCommand{})
 
-        // register common commands
+        // Charm publishing commands.
+        juju.Register(&PublishCommand{})
+
+        // Common commands.
         juju.Register(&cmd.VersionCommand{})
 
         os.Exit(cmd.Main(juju, cmd.DefaultContext(), args[1:]))
 }
 
 func main() {
         Main(os.Args)
 }