aboutsummaryrefslogtreecommitdiff
path: root/libpod/runtime_img.go
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 /libpod/runtime_img.go
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 'libpod/runtime_img.go')
-rw-r--r--libpod/runtime_img.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index 6ac32878b..919080c42 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -71,7 +71,8 @@ func (r *Runtime) RemoveImage(ctx context.Context, img *image.Image, force bool)
// to and untag it.
repoName, err := img.MatchRepoTag(img.InputName)
if hasChildren && errors.Cause(err) == image.ErrRepoTagNotFound {
- return nil, errors.Errorf("unable to delete %q (cannot be forced) - image has dependent child images", img.ID())
+ return nil, errors.Wrapf(define.ErrImageInUse,
+ "unable to delete %q (cannot be forced) - image has dependent child images", img.ID())
}
if err != nil {
return nil, err
@@ -84,7 +85,8 @@ func (r *Runtime) RemoveImage(ctx context.Context, img *image.Image, force bool)
} else if len(img.Names()) > 1 && img.InputIsID() && !force {
// If the user requests to delete an image by ID and the image has multiple
// reponames and no force is applied, we error out.
- return nil, fmt.Errorf("unable to delete %s (must force) - image is referred to in multiple tags", img.ID())
+ return nil, errors.Wrapf(define.ErrImageInUse,
+ "unable to delete %s (must force) - image is referred to in multiple tags", img.ID())
}
err = img.Remove(ctx, force)
if err != nil && errors.Cause(err) == storage.ErrImageUsedByContainer {