diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-27 16:01:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 16:01:45 +0200 |
| commit | 0906b32087c3d7db6844873a7d46241430a1b065 (patch) | |
| tree | 3c68a0c2d6e2e5742b4cc314136ddb8e9877ec75 /libpod/container_graph.go | |
| parent | 5e3d63a53c0762c99c5eb7863ef7fc8d0b2e8eec (diff) | |
| parent | 8561b996447793999a6465f9b9e3f0f7bbea2c6a (diff) | |
| download | podman-0906b32087c3d7db6844873a7d46241430a1b065.tar.gz podman-0906b32087c3d7db6844873a7d46241430a1b065.tar.bz2 podman-0906b32087c3d7db6844873a7d46241430a1b065.zip | |
Merge pull request #3442 from baude/removelibpodfrommainphase2
libpod removal from main (phase 2)
Diffstat (limited to 'libpod/container_graph.go')
| -rw-r--r-- | libpod/container_graph.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_graph.go b/libpod/container_graph.go index c266c5227..50dbdfbe4 100644 --- a/libpod/container_graph.go +++ b/libpod/container_graph.go @@ -244,13 +244,13 @@ func startNode(ctx context.Context, node *containerNode, setError bool, ctrError // Start the container (only if it is not running) if !ctrErrored { - if !restart && node.container.state.State != ContainerStateRunning { + if !restart && node.container.state.State != define.ContainerStateRunning { if err := node.container.initAndStart(ctx); err != nil { ctrErrored = true ctrErrors[node.id] = err } } - if restart && node.container.state.State != ContainerStatePaused && node.container.state.State != ContainerStateUnknown { + if restart && node.container.state.State != define.ContainerStatePaused && node.container.state.State != define.ContainerStateUnknown { if err := node.container.restartWithTimeout(ctx, node.container.config.StopTimeout); err != nil { ctrErrored = true ctrErrors[node.id] = err |