summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-01-04 10:49:52 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2021-01-04 10:51:54 -0500
commitd0093026a24883bed951a51743fb0a5a4888d2fd (patch)
tree2061d2477da9601480bf9c550f43a60fca5adc22
parentf261bfc54961c156c3a4acc2cd1c5379a83f1c0b (diff)
downloadpodman-d0093026a24883bed951a51743fb0a5a4888d2fd.tar.gz
podman-d0093026a24883bed951a51743fb0a5a4888d2fd.tar.bz2
podman-d0093026a24883bed951a51743fb0a5a4888d2fd.zip
Allow image errors to bubble up from lower level functions.
Currently we ignore ErrMultipleImages being returned from findImageInRepoTags. Fixes: https://github.com/containers/podman/issues/8868 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--libpod/image/image.go2
-rw-r--r--libpod/image/utils.go3
2 files changed, 3 insertions, 2 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go
index 5c3f3b9e4..a9082b2c6 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -497,7 +497,7 @@ func (ir *Runtime) getLocalImage(inputName string) (string, *storage.Image, erro
return inputName, repoImage, nil
}
- return "", nil, errors.Wrapf(ErrNoSuchImage, err.Error())
+ return "", nil, err
}
// ID returns the image ID as a string
diff --git a/libpod/image/utils.go b/libpod/image/utils.go
index 727c73a71..5e7fed5c6 100644
--- a/libpod/image/utils.go
+++ b/libpod/image/utils.go
@@ -45,7 +45,8 @@ func findImageInRepotags(search imageParts, images []*Image) (*storage.Image, er
}
}
if len(candidates) == 0 {
- return nil, errors.Errorf("unable to find a name and tag match for %s in repotags", searchName)
+
+ return nil, errors.Wrapf(define.ErrNoSuchImage, "unable to find a name and tag match for %s in repotags", searchName)
}
// If more then one candidate and the candidates all have same name