浏览代码

update style

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Victor Vieux 11 年之前
父节点
当前提交
56a39ca5d3
共有 1 个文件被更改,包括 6 次插入10 次删除
  1. 6 10
      api/client/commands.go

+ 6 - 10
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)
-	}
-
-	fmt.Fprintf(cli.out, "Remove login credentials for %s\n", serverAddress)
-	delete(cli.configFile.Configs, serverAddress)
+	} 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 {
-		fmt.Fprintln(cli.out, "Failed to save docker config")
-		os.Exit(1)
+		if err := registry.SaveConfig(cli.configFile); err != nil {
+			return fmt.Errorf("Failed to save docker config: %v", err)
+		}
 	}
-
-	fmt.Fprintln(cli.out, "Saved docker config")
 	return nil
 }