diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-13 18:12:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 18:12:25 +0200 |
| commit | 7875e00c663a42dd26c99889206cdb8f16ff0905 (patch) | |
| tree | 7ce115ad37c16634a8c4d42e0d0c89ae3002b3bf /cmd/podman/main.go | |
| parent | 5c09c4d2947a759724f9d5aef6bac04317e03f7e (diff) | |
| parent | 82ac0d8925dbb5aa738f1494ecb002eb6daca992 (diff) | |
| download | podman-7875e00c663a42dd26c99889206cdb8f16ff0905.tar.gz podman-7875e00c663a42dd26c99889206cdb8f16ff0905.tar.bz2 podman-7875e00c663a42dd26c99889206cdb8f16ff0905.zip | |
Merge pull request #3934 from rhatdan/wait
Podman-remote run should wait for exit code
Diffstat (limited to 'cmd/podman/main.go')
| -rw-r--r-- | cmd/podman/main.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 2b808b2bc..b83ccd9a5 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -8,6 +8,7 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/define" _ "github.com/containers/libpod/pkg/hooks/0.1.0" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/version" @@ -20,7 +21,7 @@ import ( // This is populated by the Makefile from the VERSION file // in the repository var ( - exitCode = 125 + exitCode = define.ExecErrorCodeGeneric Ctx context.Context span opentracing.Span closer io.Closer @@ -152,11 +153,12 @@ func main() { if err := rootCmd.Execute(); err != nil { outputError(err) } else { - // The exitCode modified from 125, indicates an application + // The exitCode modified from define.ExecErrorCodeGeneric, + // indicates an application // running inside of a container failed, as opposed to the // podman command failed. Must exit with that exit code // otherwise command exited correctly. - if exitCode == 125 { + if exitCode == define.ExecErrorCodeGeneric { exitCode = 0 } |