diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-11-17 16:41:52 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-11-18 12:57:39 -0500 |
| commit | 72b67715f8c97fce7bde4677eacfa413b1dafb88 (patch) | |
| tree | cf72dc6e1493cb2e6c5af4a56093bf0adf29ac6c /pkg/domain/infra | |
| parent | 6ece1d97c428f1641cb35972357cd037562fd06e (diff) | |
| download | podman-72b67715f8c97fce7bde4677eacfa413b1dafb88.tar.gz podman-72b67715f8c97fce7bde4677eacfa413b1dafb88.tar.bz2 podman-72b67715f8c97fce7bde4677eacfa413b1dafb88.zip | |
podman-remote network rm --force is broken
The --force parameter was not being handled correctly.
This is leading to some race conditions in testing failures.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/network.go | 2 |
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 } } |