Propegate exit code on Exec calls and integrated test

Signed-off-by: haircommander <pehunt@redhat.com>

Closes: #904
Approved by: rhatdan

1 files changed, 8 insertions, 0 deletions

diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index d4c437706..8edecffb3 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -3,7 +3,9 @@ package main
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"runtime/pprof"
+	"syscall"
 
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/pkg/errors"
@@ -175,6 +177,12 @@ func main() {
 		if debug {
 			logrus.Errorf(err.Error())
 		} else {
+			// Retrieve the exit error from the exec call, if it exists
+			if ee, ok := err.(*exec.ExitError); ok {
+				if status, ok := ee.Sys().(syscall.WaitStatus); ok {
+					exitCode = status.ExitStatus()
+				}
+			}
 			fmt.Fprintln(os.Stderr, err.Error())
 		}
 	} else {