summaryrefslogtreecommitdiff
path: root/libpod/image
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2018-07-18 22:32:56 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-07-23 12:44:38 +0000
commit014b3dcc356c165638aa57669f0a550ad5b1e2e7 (patch)
tree35403b1ce87667a9e567516173cdddb5ed4f48a8 /libpod/image
parente8bc9141343714cd0266daafbcb6eaf121aaab3b (diff)
downloadpodman-014b3dcc356c165638aa57669f0a550ad5b1e2e7.tar.gz
podman-014b3dcc356c165638aa57669f0a550ad5b1e2e7.tar.bz2
podman-014b3dcc356c165638aa57669f0a550ad5b1e2e7.zip
Inline getTags into its only user
This also eliminates a duplicate call to reference.Parse() and removes an impossible erorr path. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com> Closes: #1112 Approved by: rhatdan
Diffstat (limited to 'libpod/image')
-rw-r--r--libpod/image/parts.go5
-rw-r--r--libpod/image/utils.go10
2 files changed, 1 insertions, 14 deletions
diff --git a/libpod/image/parts.go b/libpod/image/parts.go
index 07a119c28..bfc708ad7 100644
--- a/libpod/image/parts.go
+++ b/libpod/image/parts.go
@@ -28,10 +28,7 @@ func decompose(input string) (imageParts, error) {
if err != nil {
return parts, err
}
- ntag, isTagged, err := getTags(input)
- if err != nil {
- return parts, err
- }
+ ntag, isTagged := imgRef.(reference.NamedTagged)
if !isTagged {
tag = "latest"
if strings.Contains(input, "@sha256:") {
diff --git a/libpod/image/utils.go b/libpod/image/utils.go
index 661fece07..de85ca67e 100644
--- a/libpod/image/utils.go
+++ b/libpod/image/utils.go
@@ -12,16 +12,6 @@ import (
"github.com/pkg/errors"
)
-func getTags(nameInput string) (reference.NamedTagged, bool, error) {
- inputRef, err := reference.Parse(nameInput)
- if err != nil {
- return nil, false, errors.Wrapf(err, "unable to obtain tag from input name")
- }
- tagged, isTagged := inputRef.(reference.NamedTagged)
-
- return tagged, isTagged, nil
-}
-
// findImageInRepotags takes an imageParts struct and searches images' repotags for
// a match on name:tag
func findImageInRepotags(search imageParts, images []*Image) (*storage.Image, error) {