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

Use an early exit if a docker-archive: image has no repo tags

Browse Source 
This avoids another "append an only item to an empty array"
pattern, and will allow us to get rid of the "dest" variable
entirely.

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

Closes: #1176
Approved by: rhatdan
This commit is contained in:
Miloslav Trmač
2018-07-27 03:36:25 +02:00
committed by Atomic Bot
parent d4dbe66774
commit e8f7442831
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/image/pull.go
View File

@ -109,18 +109,17 @@ func refNamesFromImageReference(ctx context.Context, srcRef types.ImageReference
return []*pullRefName{getPullRefName(srcRef, reference)}, nil return []*pullRefName{getPullRefName(srcRef, reference)}, nil
} }
var dest []string
if len(manifest[0].RepoTags) == 0 { if len(manifest[0].RepoTags) == 0 {
// If the input image has no repotags, we need to feed it a dest anyways // If the input image has no repotags, we need to feed it a dest anyways
digest, err := getImageDigest(ctx, srcRef, sc) digest, err := getImageDigest(ctx, srcRef, sc)
if err != nil { if err != nil {
return nil, err return nil, err
} }
dest = append(dest, digest) return []*pullRefName{getPullRefName(srcRef, digest)}, nil
} else {
// Need to load in all the repo tags from the manifest
dest = append(dest, manifest[0].RepoTags...)
} }
// Need to load in all the repo tags from the manifest
dest := manifest[0].RepoTags
res := []*pullRefName{} res := []*pullRefName{}
for _, dst := range dest { for _, dst := range dest {
pullInfo := getPullRefName(srcRef, dst) pullInfo := getPullRefName(srcRef, dst)