diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-16 17:38:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 17:38:41 +0100 |
| commit | 4406e1cfeed18fe89c0ad4e20a3c3b2f4b9ffcae (patch) | |
| tree | 07ec5828e7eda224f8b446210e2d1d6d2cbdaba7 | |
| parent | d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0 (diff) | |
| parent | 33889c642deaaf3d6977ea6463f5937f549fb52b (diff) | |
| download | podman-4406e1cfeed18fe89c0ad4e20a3c3b2f4b9ffcae.tar.gz podman-4406e1cfeed18fe89c0ad4e20a3c3b2f4b9ffcae.tar.bz2 podman-4406e1cfeed18fe89c0ad4e20a3c3b2f4b9ffcae.zip | |
Merge pull request #2169 from mheon/ensure_wait_doesnot_hang
Ensure that wait exits on state transition
| -rw-r--r-- | libpod/container_internal.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 90f4659da..ce8791f08 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -540,7 +540,7 @@ func (c *Container) isStopped() (bool, error) { if err != nil { return true, err } - return (c.state.State == ContainerStateStopped || c.state.State == ContainerStateExited), nil + return (c.state.State != ContainerStateRunning && c.state.State != ContainerStatePaused), nil } // save container state to the database |