Merge pull request #2423 from rhatdan/rm

Change exit code to 1 on podman rm nosuch container

3 files changed, 34 insertions, 4 deletions

diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go
index 01ed70f52..2dcb491d7 100644
--- a/cmd/podman/rm.go
+++ b/cmd/podman/rm.go
@@ -7,6 +7,7 @@ import (
 	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/image"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -61,15 +62,21 @@ func rmCmd(c *cliconfig.RmValues) error {
 	}
 	defer runtime.Shutdown(false)
 
+	failureCnt := 0
 	delContainers, err := getAllOrLatestContainers(&c.PodmanCommand, runtime, -1, "all")
 	if err != nil {
 		if c.Force && len(c.InputArgs) > 0 {
 			if errors.Cause(err) == libpod.ErrNoSuchCtr {
 				err = nil
+			} else {
+				failureCnt++
 			}
 			runtime.RemoveContainersFromStorage(c.InputArgs)
 		}
 		if len(delContainers) == 0 {
+			if err != nil && failureCnt == 0 {
+				exitCode = 1
+			}
 			return err
 		}
 		if err != nil {
@@ -96,5 +103,16 @@ func rmCmd(c *cliconfig.RmValues) error {
 
 	// Run the parallel funcs
 	deleteErrors, errCount := shared.ParallelExecuteWorkerPool(maxWorkers, deleteFuncs)
-	return printParallelOutput(deleteErrors, errCount)
+	err = printParallelOutput(deleteErrors, errCount)
+	if err != nil {
+		for _, result := range deleteErrors {
+			if result != nil && errors.Cause(result) != image.ErrNoSuchCtr {
+				failureCnt++
+			}
+		}
+		if failureCnt == 0 {
+			exitCode = 1
+		}
+	}
+	return err
 }
diff --git a/docs/podman-rm.1.md b/docs/podman-rm.1.md
index 10ebe97f9..dc1729188 100644
--- a/docs/podman-rm.1.md
+++ b/docs/podman-rm.1.md
@@ -1,9 +1,11 @@
-% podman-rm(1)
+% podman-container-rm(1)
 
 ## NAME
-podman\-rm - Remove one or more containers
+podman\-container\-rm (podman\-rm) - Remove one or more containers
 
 ## SYNOPSIS
+**podman container rm** [*options*] *container*
+
 **podman rm** [*options*] *container*
 
 ## DESCRIPTION
@@ -57,8 +59,13 @@ Forcibly remove the latest container created.
 podman rm -f --latest
 ```
 
+## Exit Status
+**_0_** if all specified containers removed
+**_1_** if one of the specified containers did not exist, and no other failures
+**_125_** if command fails for a reason other then an container did not exist
+
 ## SEE ALSO
-podman(1), podman-rmi(1)
+podman(1), podman-image-rm(1)
 
 ## HISTORY
 August 2017, Originally compiled by Ryan Cole <rycole@redhat.com>
diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go
index bc1431bce..71dacfa80 100644
--- a/test/e2e/rm_test.go
+++ b/test/e2e/rm_test.go
@@ -128,4 +128,9 @@ var _ = Describe("Podman rm", func() {
 		Expect(podmanTest.NumberOfContainers()).To(Equal(1))
 
 	})
+	It("podman rm bogus container", func() {
+		session := podmanTest.Podman([]string{"rm", "bogus"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(1))
+	})
 })