diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-21 10:12:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-21 10:12:01 -0400 |
commit | e9ddfa0518e0fd5e026b3d981bd289865bc7a1aa (patch) | |
tree | 37a7436c00bafb0f817d2e60a8fd7800b89c3bb2 /pkg/domain/infra/tunnel/helpers.go | |
parent | 0a46b9c9e6aab2a5255914b285ae5b3cddb2aa5b (diff) | |
parent | 1b610e93d264b7823ed6658d1fb4f34331561c3d (diff) | |
download | podman-e9ddfa0518e0fd5e026b3d981bd289865bc7a1aa.tar.gz podman-e9ddfa0518e0fd5e026b3d981bd289865bc7a1aa.tar.bz2 podman-e9ddfa0518e0fd5e026b3d981bd289865bc7a1aa.zip |
Merge pull request #7697 from rhatdan/ignore
Fix handling of podman-remote stop --ignore
Diffstat (limited to 'pkg/domain/infra/tunnel/helpers.go')
-rw-r--r-- | pkg/domain/infra/tunnel/helpers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go index 0c38a3326..5944f855a 100644 --- a/pkg/domain/infra/tunnel/helpers.go +++ b/pkg/domain/infra/tunnel/helpers.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" ) -func getContainersByContext(contextWithConnection context.Context, all bool, namesOrIDs []string) ([]entities.ListContainer, error) { +func getContainersByContext(contextWithConnection context.Context, all, ignore bool, namesOrIDs []string) ([]entities.ListContainer, error) { var ( cons []entities.ListContainer ) @@ -36,7 +36,7 @@ func getContainersByContext(contextWithConnection context.Context, all bool, nam break } } - if !found { + if !found && !ignore { return nil, errors.Wrapf(define.ErrNoSuchCtr, "unable to find container %q", id) } } |