containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3538 from giuseppe/fix-some-regressions 

runtime: drop spurious message log
This commit is contained in:
OpenShift Merge Robot 2019-07-10 17:27:53 +02:00 committed by GitHub
parent de2ecfe59c 18c4d73867
commit df3f5afad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/runtime_ctr.go
View File

@ -439,10 +439,13 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool,
} }
} else { } else {
if err := r.state.RemoveContainer(c); err != nil { if err := r.state.RemoveContainer(c); err != nil {
if cleanupErr == nil {
cleanupErr = err 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 // Set container as invalid so it can no longer be used
c.valid = false c.valid = false