summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2020-04-22 15:29:47 -0700
committerJhon Honce <jhonce@redhat.com>2020-04-22 15:34:33 -0700
commitbe5605ac4f0a9765c11bbd52ef0a658d2439b372 (patch)
treefdf0f01b0971f98e86f7084b9ffc608eebd91774 /pkg/domain/infra
parentbf1e5b875f365cc42cfd2a88fbe7e577e05a49f7 (diff)
downloadpodman-be5605ac4f0a9765c11bbd52ef0a658d2439b372.tar.gz
podman-be5605ac4f0a9765c11bbd52ef0a658d2439b372.tar.bz2
podman-be5605ac4f0a9765c11bbd52ef0a658d2439b372.zip
V2 Restore rmi tests
* Introduced define.ErrImageInUse to assist in determining the exit code without resorting string searches. Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/abi/images.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index d0b7b42b5..caed432f9 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -466,7 +466,7 @@ func (ir *ImageEngine) Remove(ctx context.Context, images []string, opts entitie
}()
// deleteImage is an anonymous function to conveniently delete an image
- // withouth having to pass all local data around.
+ // without having to pass all local data around.
deleteImage := func(img *image.Image) error {
results, err := ir.Libpod.RemoveImage(ctx, img, opts.Force)
switch errors.Cause(err) {
@@ -476,6 +476,9 @@ func (ir *ImageEngine) Remove(ctx context.Context, images []string, opts entitie
inUseErrors = true // Important for exit codes in Podman.
return errors.New(
fmt.Sprintf("A container associated with containers/storage, i.e. via Buildah, CRI-O, etc., may be associated with this image: %-12.12s\n", img.ID()))
+ case define.ErrImageInUse:
+ inUseErrors = true
+ return err
default:
otherErrors = true // Important for exit codes in Podman.
return err