github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-13 12:16:16 +00:00
Code Issues Projects Releases Wiki Activity

Inline isTagSpecified into its only caller

Browse Source 
We already parsed the input string in the caller,
so this is much simpler.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2020-05-22 02:57:51 +02:00 committed by Valentin Rothberg
parent 0ee81dc9fe
commit 35f3595d02
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/skopeo/sync.go
View File

@ -206,22 +206,6 @@ func getImageTags(ctx context.Context, sysCtx *types.SystemContext, repoRef refe
return tags, nil return tags, nil
} }
// isTagSpecified checks if an image name includes a tag and returns any errors
// encountered.
func isTagSpecified(imageName string) (bool, error) {
normNamed, err := reference.ParseNormalizedNamed(imageName)
if err != nil {
return false, err
}
tagged := !reference.IsNameOnly(normNamed)
logrus.WithFields(logrus.Fields{
"imagename": imageName,
"tagged": tagged,
}).Info("Tag presence check")
return tagged, nil
}
// imagesToCopyFromRepo builds a list of image references from the tags // imagesToCopyFromRepo builds a list of image references from the tags
// found in a source repository. // found in a source repository.
// It returns an image reference slice with as many elements as the tags found // It returns an image reference slice with as many elements as the tags found
@ -410,11 +394,11 @@ func imagesToCopy(source string, transport string, sourceCtx *types.SystemContex
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "Cannot obtain a valid image reference for transport %q and reference %q", docker.Transport.Name(), source) return nil, errors.Wrapf(err, "Cannot obtain a valid image reference for transport %q and reference %q", docker.Transport.Name(), source)
} }
imageTagged, err := isTagSpecified(source) imageTagged := !reference.IsNameOnly(named)
if err != nil { logrus.WithFields(logrus.Fields{
return descriptors, err "imagename": source,
} "tagged": imageTagged,
}).Info("Tag presence check")
if imageTagged { if imageTagged {
srcRef, err := docker.NewReference(named) srcRef, err := docker.NewReference(named)
if err != nil { if err != nil {