Merge pull request #2421 from rhatdan/rmi

Change exit code to 1 on podman rmi nosuch image

1 files changed, 1 insertions, 19 deletions

diff --git a/cmd/podman/errors.go b/cmd/podman/errors.go
index 192f97049..2572b8779 100644
--- a/cmd/podman/errors.go
+++ b/cmd/podman/errors.go
@@ -6,8 +6,6 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/containers/libpod/cmd/podman/varlink"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
@@ -20,22 +18,6 @@ func outputError(err error) {
 				exitCode = status.ExitStatus()
 			}
 		}
-		var ne error
-		switch e := err.(type) {
-		// For some reason golang wont let me list them with commas so listing them all.
-		case *iopodman.ImageNotFound:
-			ne = errors.New(e.Reason)
-		case *iopodman.ContainerNotFound:
-			ne = errors.New(e.Reason)
-		case *iopodman.PodNotFound:
-			ne = errors.New(e.Reason)
-		case *iopodman.VolumeNotFound:
-			ne = errors.New(e.Reason)
-		case *iopodman.ErrorOccurred:
-			ne = errors.New(e.Reason)
-		default:
-			ne = err
-		}
-		fmt.Fprintln(os.Stderr, "Error:", ne.Error())
+		fmt.Fprintln(os.Stderr, "Error:", err.Error())
 	}
 }