summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-17 13:44:45 +0100
committerGitHub <noreply@github.com>2019-02-17 13:44:45 +0100
commita99f4924d9d76f59e85bde09944d7c5e687ea8aa (patch)
tree7cb441933f95ebe230ad019d2f8d84dd640d5bc4 /cmd
parent1cb16bd24bc86450d99b4cb25601b0b040c49b86 (diff)
parentc90d3177ad078ccdc3c71514ee53cabfbf390a95 (diff)
downloadpodman-a99f4924d9d76f59e85bde09944d7c5e687ea8aa.tar.gz
podman-a99f4924d9d76f59e85bde09944d7c5e687ea8aa.tar.bz2
podman-a99f4924d9d76f59e85bde09944d7c5e687ea8aa.zip
Merge pull request #2340 from QiWang19/login_lying
Fix `podman login` lying problem
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/login.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/login.go b/cmd/podman/login.go
index 3eacab54a..b02a4b3f9 100644
--- a/cmd/podman/login.go
+++ b/cmd/podman/login.go
@@ -112,7 +112,7 @@ func loginCmd(c *cliconfig.LoginValues) error {
}
// If no username and no password is specified, try to use existing ones.
- if c.Username == "" && password == "" {
+ if c.Username == "" && password == "" && userFromAuthFile != "" && passFromAuthFile != "" {
fmt.Println("Authenticating with existing credentials...")
if err := docker.CheckAuth(ctx, sc, userFromAuthFile, passFromAuthFile, server); err == nil {
fmt.Println("Existing credentials are valid. Already logged in to", server)