summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2018-07-13 10:24:17 -0400
committerMatthew Heon <mheon@redhat.com>2018-07-13 14:28:41 -0400
commit028374b99e5c9dd23236a10495ea0aebe819b51f (patch)
treebcae62cde75f78ce639b5925f1a485dec98d3218 /cmd
parent14a6d51a8432fc0c3324fec02e8729d3032f2af2 (diff)
downloadpodman-028374b99e5c9dd23236a10495ea0aebe819b51f.tar.gz
podman-028374b99e5c9dd23236a10495ea0aebe819b51f.tar.bz2
podman-028374b99e5c9dd23236a10495ea0aebe819b51f.zip
Record whether the container has exited
Use this to supplement exit codes returned from containers, to make sure we know when exit codes are invalid (as the container has not yet exited) Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/batchcontainer/container.go2
-rw-r--r--cmd/podman/ps.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/batchcontainer/container.go b/cmd/podman/batchcontainer/container.go
index 09db4f8a2..76b10b633 100644
--- a/cmd/podman/batchcontainer/container.go
+++ b/cmd/podman/batchcontainer/container.go
@@ -75,7 +75,7 @@ func BatchContainerOp(ctr *libpod.Container, opts PsOptions) (BatchContainerStru
return errors.Wrapf(err, "unable to obtain container state")
}
- exitCode, err = c.ExitCode()
+ exitCode, _, err = c.ExitCode()
if err != nil {
return errors.Wrapf(err, "unable to obtain container exit code")
}
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index 49e43ffac..22055b274 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -324,7 +324,7 @@ func generateContainerFilterFuncs(filter, filterValue string, runtime *libpod.Ru
return nil, errors.Wrapf(err, "exited code out of range %q", filterValue)
}
return func(c *libpod.Container) bool {
- ec, err := c.ExitCode()
+ ec, _, err := c.ExitCode()
if ec == int32(exitCode) && err == nil {
return true
}