diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-29 20:58:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 20:58:51 +0100 |
| commit | e7540d0406c49b22de245246d16ebc6e1778df37 (patch) | |
| tree | d25a5f8d259d19f2c0017d9987e93d065e577f89 /cmd/podman/login.go | |
| parent | 5918f3a5f1d11862fbaaca94ff25f1d9cc1309e2 (diff) | |
| parent | 66c126d6dee178f96f8a120f13372802d46ea9b5 (diff) | |
| download | podman-e7540d0406c49b22de245246d16ebc6e1778df37.tar.gz podman-e7540d0406c49b22de245246d16ebc6e1778df37.tar.bz2 podman-e7540d0406c49b22de245246d16ebc6e1778df37.zip | |
Merge pull request #4310 from nalind/manifest-lists
Move to containers/image v5, support manifest lists
Diffstat (limited to 'cmd/podman/login.go')
| -rw-r--r-- | cmd/podman/login.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 96b4ac2a2..f91366eac 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -6,14 +6,15 @@ import ( "os" "strings" - "github.com/containers/image/v4/docker" - "github.com/containers/image/v4/pkg/docker/config" - "github.com/containers/image/v4/types" + "github.com/containers/image/v5/docker" + "github.com/containers/image/v5/pkg/docker/config" + "github.com/containers/image/v5/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod/image" "github.com/docker/docker-credential-helpers/credentials" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" ) @@ -134,15 +135,15 @@ func loginCmd(c *cliconfig.LoginValues) error { return err } } - switch err { - case nil: + if err == nil { fmt.Println("Login Succeeded!") return nil - case docker.ErrUnauthorizedForCredentials: + } + if unauthorizedError, ok := err.(docker.ErrUnauthorizedForCredentials); ok { + logrus.Debugf("error logging into %q: %v", server, unauthorizedError) return errors.Errorf("error logging into %q: invalid username/password", server) - default: - return errors.Wrapf(err, "error authenticating creds for %q", server) } + return errors.Wrapf(err, "error authenticating creds for %q", server) } // getUserAndPass gets the username and password from STDIN if not given |