From 3d4e2246d30537904933e78be67c8cc44dfa17ca Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 18 Jul 2014 17:52:24 +0000 Subject: [PATCH] update style Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: 56a39ca5d3010785e3b4be849c6b13c69a23721d Component: engine --- components/engine/api/client/commands.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/components/engine/api/client/commands.go b/components/engine/api/client/commands.go index 446d9b7b0a..65c06ba15c 100644 --- a/components/engine/api/client/commands.go +++ b/components/engine/api/client/commands.go @@ -369,18 +369,14 @@ func (cli *DockerCli) CmdLogout(args ...string) error { cli.LoadConfigFile() if _, ok := cli.configFile.Configs[serverAddress]; !ok { fmt.Fprintf(cli.out, "Not logged in to %s\n", serverAddress) - os.Exit(0) + } else { + fmt.Fprintf(cli.out, "Remove login credentials for %s\n", serverAddress) + delete(cli.configFile.Configs, serverAddress) + + if err := registry.SaveConfig(cli.configFile); err != nil { + return fmt.Errorf("Failed to save docker config: %v", err) + } } - - fmt.Fprintf(cli.out, "Remove login credentials for %s\n", serverAddress) - delete(cli.configFile.Configs, serverAddress) - - if err := registry.SaveConfig(cli.configFile); err != nil { - fmt.Fprintln(cli.out, "Failed to save docker config") - os.Exit(1) - } - - fmt.Fprintln(cli.out, "Saved docker config") return nil }