From 4ab7462adde0dff905e646cf4def54a2b2bc2804 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 18 Mar 2019 22:57:36 +0100 Subject: rootless, rm: fix retcode when the container is not found Signed-off-by: Giuseppe Scrivano --- cmd/podman/rm.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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) } } -- cgit v1.2.3-54-g00ecf