opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4623 from rhatdan/errors

Browse Source 
Ignore ErrCtrRemoved when removing a container
This commit is contained in:
OpenShift Merge Robot
2019-12-03 00:33:27 -08:00
committed by GitHub
parent 309452dcfc 2eda555ebe
commit 588156a9ef
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/adapter/containers.go
View File

@ -461,7 +461,8 @@ func (r *LocalRuntime) Run(ctx context.Context, c *cliconfig.RunValues, exitCode
if c.IsSet("rm") { if c.IsSet("rm") {
if err := r.Runtime.RemoveContainer(ctx, ctr, false, true); err != nil { if err := r.Runtime.RemoveContainer(ctx, ctr, false, true); err != nil {
if errors.Cause(err) == define.ErrNoSuchCtr { if errors.Cause(err) == define.ErrNoSuchCtr ||
errors.Cause(err) == define.ErrCtrRemoved {
logrus.Warnf("Container %s does not exist: %v", ctr.ID(), err) logrus.Warnf("Container %s does not exist: %v", ctr.ID(), err)
} else { } else {
logrus.Errorf("Error removing container %s: %v", ctr.ID(), err) logrus.Errorf("Error removing container %s: %v", ctr.ID(), err)