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/domain/infra/abi | |
| 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/domain/infra/abi')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 4790bd58c..637531ee9 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -301,14 +301,14 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string, for _, ctr := range names { logrus.Debugf("Evicting container %q", ctr) report := entities.RmReport{Id: ctr} - id, err := ic.Libpod.EvictContainer(ctx, ctr, options.Volumes) + _, err := ic.Libpod.EvictContainer(ctx, ctr, options.Volumes) if err != nil { if options.Ignore && errors.Cause(err) == define.ErrNoSuchCtr { logrus.Debugf("Ignoring error (--allow-missing): %v", err) reports = append(reports, &report) continue } - report.Err = errors.Wrapf(err, "failed to evict container: %q", id) + report.Err = err reports = append(reports, &report) continue } |