diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-29 18:53:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 18:53:06 +0200 |
| commit | 06dce0c7709f3890ec3dad7993c24c5cdaaf62f9 (patch) | |
| tree | e91e17ca9c46540aedbec46e7268ba5f65b24d0c /pkg/domain/infra/abi/images.go | |
| parent | 27aa3a7837fa1c5379ff7ca1a9dcd6416b2ac685 (diff) | |
| parent | a9cc13448ee3185bb63f4c3eef94e755e79b8571 (diff) | |
| download | podman-06dce0c7709f3890ec3dad7993c24c5cdaaf62f9.tar.gz podman-06dce0c7709f3890ec3dad7993c24c5cdaaf62f9.tar.bz2 podman-06dce0c7709f3890ec3dad7993c24c5cdaaf62f9.zip | |
Merge pull request #5949 from jwhonce/jira/796
V2 Restore images list tests
Diffstat (limited to 'pkg/domain/infra/abi/images.go')
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 9d6be1b15..be788b2bf 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -469,6 +469,8 @@ func (ir *ImageEngine) Remove(ctx context.Context, images []string, opts entitie switch errors.Cause(err) { case nil: break + case define.ErrNoSuchImage: + inUseErrors = true // ExitCode is expected case storage.ErrImageUsedByContainer: inUseErrors = true // Important for exit codes in Podman. return errors.New( @@ -540,7 +542,7 @@ func (ir *ImageEngine) Remove(ctx context.Context, images []string, opts entitie noSuchImageErrors = true // Important for exit codes in Podman. fallthrough default: - deleteError = multierror.Append(deleteError, err) + deleteError = multierror.Append(deleteError, errors.Wrapf(err, "failed to remove image '%s'", id)) continue } |