diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-30 19:52:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 19:52:17 +0100 |
| commit | 1fe79dd677c75af3915418d96f12b6f4a75ee568 (patch) | |
| tree | 7eac63217e5cb71d03cab39120e8b1fc417134e1 /cmd/podman/images | |
| parent | 3653e57a2a589bebfdde99fb3c0334d04f350888 (diff) | |
| parent | 831d7fb0d7ee007fc04b1b0ff24b77c7d5635f5e (diff) | |
| download | podman-1fe79dd677c75af3915418d96f12b6f4a75ee568.tar.gz podman-1fe79dd677c75af3915418d96f12b6f4a75ee568.tar.bz2 podman-1fe79dd677c75af3915418d96f12b6f4a75ee568.zip | |
Merge pull request #8177 from rhatdan/wrap
Stop excessive wrapping of errors
Diffstat (limited to 'cmd/podman/images')
| -rw-r--r-- | cmd/podman/images/pull.go | 3 | ||||
| -rw-r--r-- | cmd/podman/images/push.go | 3 | ||||
| -rw-r--r-- | cmd/podman/images/search.go | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 35ef80f3c..ab3b0a197 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -9,7 +9,6 @@ import ( "github.com/containers/podman/v2/cmd/podman/registry" "github.com/containers/podman/v2/pkg/domain/entities" "github.com/containers/podman/v2/pkg/util" - "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" ) @@ -104,7 +103,7 @@ func imagePull(cmd *cobra.Command, args []string) error { } if pullOptions.Authfile != "" { if _, err := os.Stat(pullOptions.Authfile); err != nil { - return errors.Wrapf(err, "error getting authfile %s", pullOptions.Authfile) + return err } } diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index 718bd4e8c..dd45a790f 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -8,7 +8,6 @@ import ( "github.com/containers/podman/v2/cmd/podman/registry" "github.com/containers/podman/v2/pkg/domain/entities" "github.com/containers/podman/v2/pkg/util" - "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" ) @@ -110,7 +109,7 @@ func imagePush(cmd *cobra.Command, args []string) error { if pushOptions.Authfile != "" { if _, err := os.Stat(pushOptions.Authfile); err != nil { - return errors.Wrapf(err, "error getting authfile %s", pushOptions.Authfile) + return err } } diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index 66256aaa0..aabcf98ff 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -117,7 +117,7 @@ func imageSearch(cmd *cobra.Command, args []string) error { if searchOptions.Authfile != "" { if _, err := os.Stat(searchOptions.Authfile); err != nil { - return errors.Wrapf(err, "error getting authfile %s", searchOptions.Authfile) + return err } } |