diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-10 17:27:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-10 17:27:53 +0200 |
| commit | df3f5afad13c91a6f2be9e83ae328483e047c13c (patch) | |
| tree | 6b7142b58660cff761a8db4e9d0d3167831b1f3a | |
| parent | de2ecfe59c07cdd303b2242892f325c8c7ec611d (diff) | |
| parent | 18c4d73867c3b8af5cbfa3cabec098348c40ad5c (diff) | |
| download | podman-df3f5afad13c91a6f2be9e83ae328483e047c13c.tar.gz podman-df3f5afad13c91a6f2be9e83ae328483e047c13c.tar.bz2 podman-df3f5afad13c91a6f2be9e83ae328483e047c13c.zip | |
Merge pull request #3538 from giuseppe/fix-some-regressions
runtime: drop spurious message log
| -rw-r--r-- | libpod/runtime_ctr.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index ae9b3e5bc..760a07daf 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -439,9 +439,12 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, } } else { if err := r.state.RemoveContainer(c); err != nil { - cleanupErr = err + if cleanupErr == nil { + cleanupErr = err + } else { + logrus.Errorf("removing container: %v", err) + } } - logrus.Errorf("removing container: %v", err) } // Set container as invalid so it can no longer be used |