aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-25 21:40:38 +0200
committerGitHub <noreply@github.com>2019-06-25 21:40:38 +0200
commit2476e7b1bc6c7f11307df20a71492179473d9a22 (patch)
tree1ca86a1bb3d0127ae8267467e8dff19c68046720 /cmd
parent96ccc2edf597a191fe03eff98b2905788a26553f (diff)
parent90b835db69d589de559462d988cb3fae5cf1ef49 (diff)
downloadpodman-2476e7b1bc6c7f11307df20a71492179473d9a22.tar.gz
podman-2476e7b1bc6c7f11307df20a71492179473d9a22.tar.bz2
podman-2476e7b1bc6c7f11307df20a71492179473d9a22.zip
Merge pull request #3427 from mheon/openstack_backports
Openstack backports
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/exec.go9
1 files changed, 8 insertions, 1 deletions
diff --git a/cmd/podman/exec.go b/cmd/podman/exec.go
index 073e72e64..9e265b48c 100644
--- a/cmd/podman/exec.go
+++ b/cmd/podman/exec.go
@@ -109,5 +109,12 @@ func execCmd(c *cli.Context) error {
envs = append(envs, fmt.Sprintf("%s=%s", k, v))
}
- return ctr.Exec(c.Bool("tty"), c.Bool("privileged"), envs, cmd, c.String("user"), c.String("workdir"))
+ if err := ctr.Exec(c.Bool("tty"), c.Bool("privileged"), envs, cmd, c.String("user"), c.String("workdir")); err != nil {
+ if errors.Cause(err) == libpod.ErrCtrStateInvalid {
+ exitCode = 126
+ }
+ return err
+ }
+
+ return nil
}