diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-25 14:17:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-25 14:17:45 +0100 |
| commit | 9fb0adf479b6655d93316ece0cd702c4d4920fe1 (patch) | |
| tree | 1d3289f8c48191ee57c803559d54564f81530ca7 /pkg/adapter/pods.go | |
| parent | 6187e724353f2d68943f912e0d8fc1d3d3c1f549 (diff) | |
| parent | a3d13fb286c39a2d9195b70e4265e5ac0deb6fd3 (diff) | |
| download | podman-9fb0adf479b6655d93316ece0cd702c4d4920fe1.tar.gz podman-9fb0adf479b6655d93316ece0cd702c4d4920fe1.tar.bz2 podman-9fb0adf479b6655d93316ece0cd702c4d4920fe1.zip | |
Merge pull request #4540 from vrothberg/systemd-improvements
podman rm/stop: add --allow-missing flag
Diffstat (limited to 'pkg/adapter/pods.go')
| -rw-r--r-- | pkg/adapter/pods.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go index d73a8b21b..e9f3d41a9 100644 --- a/pkg/adapter/pods.go +++ b/pkg/adapter/pods.go @@ -15,6 +15,7 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/adapter/shortcuts" ann "github.com/containers/libpod/pkg/annotations" @@ -94,7 +95,7 @@ func (r *LocalRuntime) RemovePods(ctx context.Context, cli *cliconfig.PodRmValue podids []string ) pods, err := shortcuts.GetPodsByContext(cli.All, cli.Latest, cli.InputArgs, r.Runtime) - if err != nil { + if err != nil && !(cli.Ignore && errors.Cause(err) == define.ErrNoSuchPod) { errs = append(errs, err) return nil, errs } @@ -151,7 +152,7 @@ func (r *LocalRuntime) StopPods(ctx context.Context, cli *cliconfig.PodStopValue podids []string ) pods, err := shortcuts.GetPodsByContext(cli.All, cli.Latest, cli.InputArgs, r.Runtime) - if err != nil { + if err != nil && !(cli.Ignore && errors.Cause(err) == define.ErrNoSuchPod) { errs = append(errs, err) return nil, errs } |