diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-10 14:04:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-10 14:04:51 +0100 |
| commit | 786757fb01208cf72e1c67611acbab1411746036 (patch) | |
| tree | bf5913f1abfc434f5dc3a2fb7684c7dc416aa296 /libpod/runtime_ctr.go | |
| parent | 5331096b3882cd5c8e587200560e44ef1eb990a3 (diff) | |
| parent | f1eb8e816257d9dc810cfa6957e09db1ffa7db96 (diff) | |
| download | podman-786757fb01208cf72e1c67611acbab1411746036.tar.gz podman-786757fb01208cf72e1c67611acbab1411746036.tar.bz2 podman-786757fb01208cf72e1c67611acbab1411746036.zip | |
Merge pull request #9681 from rhatdan/rm
Removing a non existing container API should return 404
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 661ca7ff8..19690d79b 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -714,7 +714,7 @@ func (r *Runtime) evictContainer(ctx context.Context, idOrName string, removeVol id, err := r.state.LookupContainerID(idOrName) if err != nil { - return "", errors.Wrapf(err, "failed to find container %q in state", idOrName) + return "", err } // Begin by trying a normal removal. Valid containers will be removed normally. @@ -744,7 +744,7 @@ func (r *Runtime) evictContainer(ctx context.Context, idOrName string, removeVol return id, err } if !exists { - return id, errors.Wrapf(err, "failed to find container ID %q for eviction", id) + return id, err } // Re-create a container struct for removal purposes |