docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity

removed useless params

Browse Source 
Upstream-commit: 4dab2fccd39858c0fb3b783a612fb95173d34f7b
Component: engine
This commit is contained in:
Victor Vieux
2013-05-24 12:43:24 +00:00
parent 5dcedd536f
commit 4631590cee
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/engine/commands.go
View File

@@ -591,7 +591,7 @@ func (cli *DockerCli) CmdPush(args ...string) error {
return nil
}
username, err := cli.checkIfLogged(*registry == "", "push", args...)
username, err := cli.checkIfLogged(*registry == "", "push")
if err != nil {
return err
}
@@ -629,8 +629,7 @@ func (cli *DockerCli) CmdPull(args ...string) error {
}
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
}
}
@@ -1122,7 +1121,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
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)
if err != nil {
return "", err
@@ -1134,9 +1133,9 @@ func (cli *DockerCli) checkIfLogged(condition bool, action string, args ...strin
return "", err
}
// If the login failed
// If condition AND the login failed
if condition && out.Username == "" {
if err := cli.CmdLogin(args...); err != nil {
if err := cli.CmdLogin(""); err != nil {
return "", err
}