opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 13:38:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Return early in refNamesFromImageReference instead of appending to pullNames

Browse Source 
Almost all paths appended to pullNames exactly once; just construct a
single-element array in place and return it.

That way we can add empty lines as separators, and still come out shorter.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Closes: #1176
Approved by: rhatdan
This commit is contained in:
Miloslav Trmač
2018-07-27 03:20:25 +02:00
committed by Atomic Bot
parent ecc1db39b5
commit 0ef38ba079
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libpod/image/pull.go
View File

@ -86,8 +86,6 @@ func getPullRefName(srcRef types.ImageReference, destName string) *pullRefName {
// refNamesFromImageReference returns a list of pullRefName for a single ImageReference, depending on the used transport.
func refNamesFromImageReference(ctx context.Context, srcRef types.ImageReference, imgName string, sc *types.SystemContext) ([]*pullRefName, error) {
var pullNames []*pullRefName
// supports pulling from docker-archive, oci, and registries
switch srcRef.Transport().Name() {
case DockerArchive:
@ -108,26 +106,28 @@ func refNamesFromImageReference(ctx context.Context, srcRef types.ImageReference
if err != nil {
return nil, err
}
pullInfo := getPullRefName(srcRef, reference)
pullNames = append(pullNames, pullInfo)
} else {
var dest []string
if len(manifest[0].RepoTags) > 0 {
dest = append(dest, manifest[0].RepoTags...)
} else {
// If the input image has no repotags, we need to feed it a dest anyways
digest, err := getImageDigest(ctx, srcRef, sc)
if err != nil {
return nil, err
}
dest = append(dest, digest)
}
// Need to load in all the repo tags from the manifest
for _, dst := range dest {
pullInfo := getPullRefName(srcRef, dst)
pullNames = append(pullNames, pullInfo)
}
return []*pullRefName{getPullRefName(srcRef, reference)}, nil
}
var dest []string
if len(manifest[0].RepoTags) > 0 {
dest = append(dest, manifest[0].RepoTags...)
} else {
// If the input image has no repotags, we need to feed it a dest anyways
digest, err := getImageDigest(ctx, srcRef, sc)
if err != nil {
return nil, err
}
dest = append(dest, digest)
}
// Need to load in all the repo tags from the manifest
res := []*pullRefName{}
for _, dst := range dest {
pullInfo := getPullRefName(srcRef, dst)
res = append(res, pullInfo)
}
return res, nil
case OCIArchive:
// retrieve the manifest from index.json to access the image name
manifest, err := ociarchive.LoadManifestDescriptor(srcRef)
@ -146,8 +146,8 @@ func refNamesFromImageReference(ctx context.Context, srcRef types.ImageReference
} else {
dest = manifest.Annotations["org.opencontainers.image.ref.name"]
}
pullInfo := getPullRefName(srcRef, dest)
pullNames = append(pullNames, pullInfo)
return []*pullRefName{getPullRefName(srcRef, dest)}, nil
case DirTransport:
path := srcRef.StringWithinTransport()
image := path
@ -157,13 +157,11 @@ func refNamesFromImageReference(ctx context.Context, srcRef types.ImageReference
// so docker.io isn't prepended, and the path becomes the repository
image = DefaultLocalRepo + image
}
pullInfo := getPullRefName(srcRef, image)
pullNames = append(pullNames, pullInfo)
return []*pullRefName{getPullRefName(srcRef, image)}, nil
default:
pullInfo := getPullRefName(srcRef, imgName)
pullNames = append(pullNames, pullInfo)
return []*pullRefName{getPullRefName(srcRef, imgName)}, nil
}
return pullNames, nil
}
// refPairsFromImageReference returns a list of pullRefPair for a single ImageReference, depending on the used transport.