diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-01 13:37:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-01 13:37:19 +0200 |
| commit | 6f62dac163dd935866c21e91e5cd623772907eda (patch) | |
| tree | c54863804158f85e206352da00133c0f12c60f7e /cmd/podman/rm.go | |
| parent | ee15e76da0a032bad7cb94295dc32e2553f10850 (diff) | |
| parent | 5370d9cb76a8075332f5ab6a0efef9fba28ba19b (diff) | |
| download | podman-6f62dac163dd935866c21e91e5cd623772907eda.tar.gz podman-6f62dac163dd935866c21e91e5cd623772907eda.tar.bz2 podman-6f62dac163dd935866c21e91e5cd623772907eda.zip | |
Merge pull request #3341 from rhatdan/exit
Add new exit codes to rm & rmi for running containers & dependencies
Diffstat (limited to 'cmd/podman/rm.go')
| -rw-r--r-- | cmd/podman/rm.go | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go index 958ca1c60..9e3ce4d0b 100644 --- a/cmd/podman/rm.go +++ b/cmd/podman/rm.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/adapter" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -65,18 +64,16 @@ func rmCmd(c *cliconfig.RmValues) error { ok, failures, err := runtime.RemoveContainers(getContext(), c) if err != nil { - if errors.Cause(err) == define.ErrNoSuchCtr { - if len(c.InputArgs) > 1 { - exitCode = 125 - } else { - exitCode = 1 - } + if len(c.InputArgs) < 2 { + exitCode = setExitCode(err) } return err } if len(failures) > 0 { - exitCode = 125 + for _, err := range failures { + exitCode = setExitCode(err) + } } return printCmdResults(ok, failures) |