From 014b3dcc356c165638aa57669f0a550ad5b1e2e7 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Wed, 18 Jul 2018 22:32:56 +0200 Subject: Inline getTags into its only user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also eliminates a duplicate call to reference.Parse() and removes an impossible erorr path. Should not change behavior. Signed-off-by: Miloslav Trmač Closes: #1112 Approved by: rhatdan --- libpod/image/parts.go | 5 +---- libpod/image/utils.go | 10 ---------- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'libpod/image') 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) { -- cgit v1.2.3-54-g00ecf