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/specgenutil/createparse.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/specgenutil/createparse.go')
| -rw-r--r-- | pkg/specgenutil/createparse.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/specgenutil/createparse.go b/pkg/specgenutil/createparse.go index 132f93771..373fb6faa 100644 --- a/pkg/specgenutil/createparse.go +++ b/pkg/specgenutil/createparse.go @@ -1,9 +1,10 @@ package specgenutil import ( + "errors" + "github.com/containers/common/pkg/config" "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/pkg/errors" ) // validate determines if the flags and values given by the user are valid. things checked @@ -11,7 +12,7 @@ import ( func validate(c *entities.ContainerCreateOptions) error { var () if c.Rm && (c.Restart != "" && c.Restart != "no" && c.Restart != "on-failure") { - return errors.Errorf(`the --rm option conflicts with --restart, when the restartPolicy is not "" and "no"`) + return errors.New(`the --rm option conflicts with --restart, when the restartPolicy is not "" and "no"`) } if _, err := config.ParsePullPolicy(c.Pull); err != nil { |