From 18c4d73867c3b8af5cbfa3cabec098348c40ad5c Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 9 Jul 2019 20:49:21 +0200 Subject: runtime: drop spurious message log fix a regression introduced by 1d36501f961889f554daf3c696fe95443ef211b6 Signed-off-by: Giuseppe Scrivano --- libpod/runtime_ctr.go | 7 +++++-- 1 file 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 -- cgit v1.2.3-54-g00ecf