diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-09 16:39:01 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-10 04:08:29 -0500 |
| commit | f1eb8e816257d9dc810cfa6957e09db1ffa7db96 (patch) | |
| tree | ed0bbddcfec6d2a58004ccaa2610a3fd673f9b0e /pkg/api | |
| parent | 09473d43001f5818dbb178cba81f2f61e3de1457 (diff) | |
| download | podman-f1eb8e816257d9dc810cfa6957e09db1ffa7db96.tar.gz podman-f1eb8e816257d9dc810cfa6957e09db1ffa7db96.tar.bz2 podman-f1eb8e816257d9dc810cfa6957e09db1ffa7db96.zip | |
Removing a non existing container API should return 404
Currently we were overwrapping error returned from removal
of a non existing container.
$ podman rm bogus -f
Error: failed to evict container: "": failed to find container "bogus" in state: no container with name or ID bogus found: no such container
Removal of wraps gets us to.
./bin/podman rm bogus -f
Error: no container with name or ID "bogus" found: no such container
Finally also added quotes around container name to help make it standout
when you get an error, currently it gets lost in the error.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/containers.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go index d26bb50f4..d3277b815 100644 --- a/pkg/api/handlers/compat/containers.go +++ b/pkg/api/handlers/compat/containers.go @@ -76,7 +76,12 @@ func RemoveContainer(w http.ResponseWriter, r *http.Request) { return } if len(report) > 0 && report[0].Err != nil { - utils.InternalServerError(w, report[0].Err) + err = report[0].Err + if errors.Cause(err) == define.ErrNoSuchCtr { + utils.ContainerNotFound(w, name, err) + return + } + utils.InternalServerError(w, err) return } |