浏览代码

removed useless params

Victor Vieux 12 年之前
父节点
当前提交
4dab2fccd3
共有 1 个文件被更改,包括 5 次插入6 次删除
  1. 5 6
      commands.go

+ 5 - 6
commands.go

@@ -591,7 +591,7 @@ func (cli *DockerCli) CmdPush(args ...string) error {
 		return nil
 		return nil
 	}
 	}
 
 
-	username, err := cli.checkIfLogged(*registry == "", "push", args...)
+	username, err := cli.checkIfLogged(*registry == "", "push")
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
@@ -629,8 +629,7 @@ func (cli *DockerCli) CmdPull(args ...string) error {
 	}
 	}
 
 
 	if strings.Contains(remote, "/") {
 	if strings.Contains(remote, "/") {
-		fmt.Println("Login is required before pull an user's repository")
-		if _, err := cli.checkIfLogged(true, "pull", args...); err != nil {
+		if _, err := cli.checkIfLogged(true, "pull"); err != nil {
 			return err
 			return err
 		}
 		}
 	}
 	}
@@ -1122,7 +1121,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
 	return nil
 	return nil
 }
 }
 
 
-func (cli *DockerCli) checkIfLogged(condition bool, action string, args ...string) (string, error) {
+func (cli *DockerCli) checkIfLogged(condition bool, action string) (string, error) {
 	body, _, err := cli.call("GET", "/auth", nil)
 	body, _, err := cli.call("GET", "/auth", nil)
 	if err != nil {
 	if err != nil {
 		return "", err
 		return "", err
@@ -1134,9 +1133,9 @@ func (cli *DockerCli) checkIfLogged(condition bool, action string, args ...strin
 		return "", err
 		return "", err
 	}
 	}
 
 
-	// If the login failed
+	// If condition AND the login failed
 	if condition && out.Username == "" {
 	if condition && out.Username == "" {
-		if err := cli.CmdLogin(args...); err != nil {
+		if err := cli.CmdLogin(""); err != nil {
 			return "", err
 			return "", err
 		}
 		}