Fix podman rm to have correct exit codes

If you attempt to remove a running container is it supposed to exit with
2
If you attempt to remove a non existing container is is supposed to exit with
1

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

2 files changed, 14 insertions, 6 deletions

diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go
index 12a7a3d89..3021853a9 100644
--- a/cmd/podman/containers/rm.go
+++ b/cmd/podman/containers/rm.go
@@ -95,11 +95,9 @@ func rm(cmd *cobra.Command, args []string) error {
 	}
 	responses, err := registry.ContainerEngine().ContainerRm(context.Background(), args, rmOptions)
 	if err != nil {
-		// TODO exitcode is a global main variable to track exit codes.
-		// we need this enabled
-		//if len(c.InputArgs) < 2 {
-		//	exitCode = setExitCode(err)
-		//}
+		if len(args) < 2 {
+			setExitCode(err)
+		}
 		return err
 	}
 	for _, r := range responses {
@@ -108,6 +106,7 @@ func rm(cmd *cobra.Command, args []string) error {
 			if errors.Cause(err) == define.ErrWillDeadlock {
 				logrus.Errorf("Potential deadlock detected - please run 'podman system renumber' to resolve")
 			}
+			setExitCode(r.Err)
 			errs = append(errs, r.Err)
 		} else {
 			fmt.Println(r.Id)
@@ -115,3 +114,13 @@ func rm(cmd *cobra.Command, args []string) error {
 	}
 	return errs.PrintErrors()
 }
+
+func setExitCode(err error) {
+	cause := errors.Cause(err)
+	switch cause {
+	case define.ErrNoSuchCtr:
+		registry.SetExitCode(1)
+	case define.ErrCtrStateInvalid:
+		registry.SetExitCode(2)
+	}
+}
diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go
index 83d20afa9..4eb568879 100644
--- a/test/e2e/rm_test.go
+++ b/test/e2e/rm_test.go
@@ -17,7 +17,6 @@ var _ = Describe("Podman rm", func() {
 	)
 
 	BeforeEach(func() {
-		Skip(v2fail)
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)