diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-19 08:30:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 08:30:05 -0700 |
| commit | a1299f506d9b93824fae737f0f68a19adaf2bde1 (patch) | |
| tree | ff27a306055f4eb6a1b57455cd15d3c7fe6eccf9 /cmd/podman/rm.go | |
| parent | ac523cbe2b257e13c7b3b823c8de83e44052ffaf (diff) | |
| parent | 4ac08d3aa1882851d4a03aa1e53c47c6fb173958 (diff) | |
| download | podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.gz podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.bz2 podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.zip | |
Merge pull request #2704 from giuseppe/fix-some-rootless
tests: fix rootless tests
Diffstat (limited to 'cmd/podman/rm.go')
| -rw-r--r-- | cmd/podman/rm.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go index 299420bb6..253771e14 100644 --- a/cmd/podman/rm.go +++ b/cmd/podman/rm.go @@ -108,6 +108,7 @@ func rmCmd(c *cliconfig.RmValues) error { c.Latest = false c.InputArgs = []string{rootless.Argument()} } else { + exitCode = 0 var containers []*libpod.Container if c.All { containers, err = runtime.GetContainers() @@ -121,6 +122,10 @@ func rmCmd(c *cliconfig.RmValues) error { for _, c := range c.InputArgs { container, err = runtime.LookupContainer(c) if err != nil { + if errors.Cause(err) == libpod.ErrNoSuchCtr { + exitCode = 1 + continue + } return err } containers = append(containers, container) @@ -136,7 +141,7 @@ func rmCmd(c *cliconfig.RmValues) error { os.Exit(ret) } } - os.Exit(0) + os.Exit(exitCode) } } |