diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-22 13:13:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 13:13:50 +0200 |
| commit | 3b52e4d0b5baacf5f63516c664a117a7537a075e (patch) | |
| tree | ef6dc8150136e7941daf45a2e6b615dee43c7893 /libpod/runtime_ctr.go | |
| parent | d6b41eb393c154eaff79b4fdcb04c7510a6fdb20 (diff) | |
| parent | db826d5d75630cca784bd7092eba5b06601ae27f (diff) | |
| download | podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.tar.gz podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.tar.bz2 podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.zip | |
Merge pull request #3562 from baude/golangcilint3
golangci-lint round #3
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 4b3aeaa37..e57ab4634 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -432,20 +432,12 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, // 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) - } + cleanupErr = err } } } else { if err := r.state.RemoveContainer(c); err != nil { - if cleanupErr == nil { - cleanupErr = err - } else { - logrus.Errorf("removing container: %v", err) - } + cleanupErr = err } } |