diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-08 18:00:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 18:00:11 +0200 |
| commit | ed3acaecbfeead3b0fef5928e47ecc9f34cd8d5b (patch) | |
| tree | 2ef0f0a0c9f3c2cd8798dee04de8c3d5ab292c36 /libpod/runtime_ctr.go | |
| parent | 1055b22e9b900e5f4d41f39b506de4f2d1aa2f8e (diff) | |
| parent | 1d36501f961889f554daf3c696fe95443ef211b6 (diff) | |
| download | podman-ed3acaecbfeead3b0fef5928e47ecc9f34cd8d5b.tar.gz podman-ed3acaecbfeead3b0fef5928e47ecc9f34cd8d5b.tar.bz2 podman-ed3acaecbfeead3b0fef5928e47ecc9f34cd8d5b.zip | |
Merge pull request #3496 from baude/golandcodeinspect
code cleanup
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 9daac161c..d022478b1 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -430,22 +430,17 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, // If we're removing the pod, the container will be evicted // from the state elsewhere if !removePod { - if err := r.state.RemoveContainerFromPod(pod, c); err != nil { - if cleanupErr == nil { - cleanupErr = err - } else { - logrus.Errorf("removing container from pod: %v", err) - } - } - } - } else { - if err := r.state.RemoveContainer(c); err != nil { if cleanupErr == nil { cleanupErr = err } else { - logrus.Errorf("removing container: %v", err) + logrus.Errorf("removing container from pod: %v", err) } } + } else { + if err := r.state.RemoveContainer(c); err != nil { + cleanupErr = err + } + logrus.Errorf("removing container: %v", err) } // Set container as invalid so it can no longer be used |