opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 16:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

rootless, rm: fix retcode when the container is not found

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-03-18 22:57:36 +01:00
parent 3f96d3617b
commit 4ab7462add
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/podman/rm.go
View File

@ -108,6 +108,7 @@ func rmCmd(c *cliconfig.RmValues) error {
c.Latest = false c.Latest = false
c.InputArgs = []string{rootless.Argument()} c.InputArgs = []string{rootless.Argument()}
} else { } else {
exitCode = 0
var containers []*libpod.Container var containers []*libpod.Container
if c.All { if c.All {
containers, err = runtime.GetContainers() containers, err = runtime.GetContainers()
@ -121,6 +122,10 @@ func rmCmd(c *cliconfig.RmValues) error {
for _, c := range c.InputArgs { for _, c := range c.InputArgs {
container, err = runtime.LookupContainer(c) container, err = runtime.LookupContainer(c)
if err != nil { if err != nil {
if errors.Cause(err) == libpod.ErrNoSuchCtr {
exitCode = 1
continue
}
return err return err
} }
containers = append(containers, container) containers = append(containers, container)
@ -136,7 +141,7 @@ func rmCmd(c *cliconfig.RmValues) error {
os.Exit(ret) os.Exit(ret)
} }
} }
os.Exit(0) os.Exit(exitCode)
} }
} }