diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-06-12 09:01:19 +0000 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-06-12 05:42:09 -0400 |
| commit | 28f2cbe0c5d71702654f2d8db29a52c19f7696a3 (patch) | |
| tree | ece8c36afecd283d11347a57cd840f508ba189cf /vendor | |
| parent | 8aa5cf3d45998bc92eaafd67ab2a59e3722bade4 (diff) | |
| download | podman-28f2cbe0c5d71702654f2d8db29a52c19f7696a3.tar.gz podman-28f2cbe0c5d71702654f2d8db29a52c19f7696a3.tar.bz2 podman-28f2cbe0c5d71702654f2d8db29a52c19f7696a3.zip | |
Bump github.com/containers/common from 0.13.0 to 0.13.1
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.13.0 to 0.13.1.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.13.0...v0.13.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/common/pkg/auth/auth.go | 11 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/vendor/github.com/containers/common/pkg/auth/auth.go b/vendor/github.com/containers/common/pkg/auth/auth.go index 1aa9f8b31..c52dfa01f 100644 --- a/vendor/github.com/containers/common/pkg/auth/auth.go +++ b/vendor/github.com/containers/common/pkg/auth/auth.go @@ -232,11 +232,20 @@ func Logout(systemContext *types.SystemContext, opts *LogoutOptions, args []stri } err = config.RemoveAuthentication(systemContext, server) - switch err { + switch errors.Cause(err) { case nil: fmt.Fprintf(opts.Stdout, "Removed login credentials for %s\n", server) return nil case config.ErrNotLoggedIn: + authConfig, err := config.GetCredentials(systemContext, server) + if err != nil { + return errors.Wrapf(err, "error reading auth file") + } + authInvalid := docker.CheckAuth(context.Background(), systemContext, authConfig.Username, authConfig.Password, server) + if authConfig.Username != "" && authConfig.Password != "" && authInvalid == nil { + fmt.Printf("Not logged into %s with current tool. Existing credentials were established via docker login. Please use docker logout instead.\n", server) + return nil + } return errors.Errorf("Not logged into %s\n", server) default: return errors.Wrapf(err, "error logging out of %q", server) diff --git a/vendor/modules.txt b/vendor/modules.txt index a44d0e88d..a470e037f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -84,7 +84,7 @@ github.com/containers/buildah/pkg/secrets github.com/containers/buildah/pkg/supplemented github.com/containers/buildah/pkg/umask github.com/containers/buildah/util -# github.com/containers/common v0.13.0 +# github.com/containers/common v0.13.1 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/auth github.com/containers/common/pkg/capabilities |