kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

removed useless params

Browse source
This commit is contained in:
Victor Vieux 2013-05-24 12:43:24 +00:00
parent 1b0b962b43
commit 4dab2fccd3
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
commands.go
View file

@ -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"); err != nil {
if _, err := cli.checkIfLogged(true, "pull", args...); 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
} }