summaryrefslogtreecommitdiff
path: root/pkg/domain
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-18 22:51:52 +0100
committerGitHub <noreply@github.com>2020-11-18 22:51:52 +0100
commitb1007caca5abbf1e9f223b4e67428b74ee5f91ef (patch)
tree03f1591c1baf956a2345e68144d121fa8373c53a /pkg/domain
parent4434bd797842c3015c0e6132eaf2509fed370c26 (diff)
parent3b6d7a3669e15a9b66df258b83ad5f4ab67a15f6 (diff)
downloadpodman-b1007caca5abbf1e9f223b4e67428b74ee5f91ef.tar.gz
podman-b1007caca5abbf1e9f223b4e67428b74ee5f91ef.tar.bz2
podman-b1007caca5abbf1e9f223b4e67428b74ee5f91ef.zip
Merge pull request #8379 from rhatdan/remote2
Remove build \!remote flags from test phase 2
Diffstat (limited to 'pkg/domain')
-rw-r--r--pkg/domain/infra/abi/network.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go
index 06941f8d0..b7f90a034 100644
--- a/pkg/domain/infra/abi/network.go
+++ b/pkg/domain/infra/abi/network.go
@@ -96,7 +96,7 @@ func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, o
if err := ic.Libpod.RemovePod(ctx, pod, true, true); err != nil {
return reports, err
}
- } else if err := ic.Libpod.RemoveContainer(ctx, c, true, true); err != nil {
+ } else if err := ic.Libpod.RemoveContainer(ctx, c, true, true); err != nil && errors.Cause(err) != define.ErrNoSuchCtr {
return reports, err
}
}