diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-08 09:24:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-08 09:24:25 +0000 |
| commit | 6087fb2116aaeae995e8423872ffe637e8be128f (patch) | |
| tree | e8bd00a9b325a51a49de02e868f06eec2deeb529 /pkg/specgen/pod_validate.go | |
| parent | a2bcf833c98cb38eb28dc65a8768963d0b7344fc (diff) | |
| parent | a46f798831df06c472b288db7b34de8536a7ea5a (diff) | |
| download | podman-6087fb2116aaeae995e8423872ffe637e8be128f.tar.gz podman-6087fb2116aaeae995e8423872ffe637e8be128f.tar.bz2 podman-6087fb2116aaeae995e8423872ffe637e8be128f.zip | |
Merge pull request #14839 from saschagrunert/errors-pkg
pkg: switch to golang native error wrapping
Diffstat (limited to 'pkg/specgen/pod_validate.go')
| -rw-r--r-- | pkg/specgen/pod_validate.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go index 8d971a25e..724be213f 100644 --- a/pkg/specgen/pod_validate.go +++ b/pkg/specgen/pod_validate.go @@ -1,8 +1,10 @@ package specgen import ( + "errors" + "fmt" + "github.com/containers/podman/v4/pkg/util" - "github.com/pkg/errors" ) var ( @@ -13,7 +15,7 @@ var ( ) func exclusivePodOptions(opt1, opt2 string) error { - return errors.Wrapf(ErrInvalidPodSpecConfig, "%s and %s are mutually exclusive pod options", opt1, opt2) + return fmt.Errorf("%s and %s are mutually exclusive pod options: %w", opt1, opt2, ErrInvalidPodSpecConfig) } // Validate verifies the input is valid |