summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-07-09 20:49:21 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-07-10 15:47:38 +0200
commit18c4d73867c3b8af5cbfa3cabec098348c40ad5c (patch)
treea0a9692bf46c06a83cd8d11a7b1541841c58aadb /libpod
parent81e722d08617ee19235bf57de6d86124e6b4574a (diff)
downloadpodman-18c4d73867c3b8af5cbfa3cabec098348c40ad5c.tar.gz
podman-18c4d73867c3b8af5cbfa3cabec098348c40ad5c.tar.bz2
podman-18c4d73867c3b8af5cbfa3cabec098348c40ad5c.zip
runtime: drop spurious message log
fix a regression introduced by 1d36501f961889f554daf3c696fe95443ef211b6 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime_ctr.go7
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