diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-23 10:32:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 10:32:15 +0200 |
| commit | c71bbffc0f32b4539897249f0f3c1d1398d9f2b4 (patch) | |
| tree | fdf0f01b0971f98e86f7084b9ffc608eebd91774 /pkg | |
| parent | bf1e5b875f365cc42cfd2a88fbe7e577e05a49f7 (diff) | |
| parent | be5605ac4f0a9765c11bbd52ef0a658d2439b372 (diff) | |
| download | podman-c71bbffc0f32b4539897249f0f3c1d1398d9f2b4.tar.gz podman-c71bbffc0f32b4539897249f0f3c1d1398d9f2b4.tar.bz2 podman-c71bbffc0f32b4539897249f0f3c1d1398d9f2b4.zip | |
Merge pull request #5948 from jwhonce/jira/826
V2 Restore rmi tests
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 5 |
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 |