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

Reorganize the tag loading in DockerArchive case

Browse Source 
This should not change behavior, only to make future edits
for an early exit easier to review.

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

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

8
libpod/image/pull.go
View File

@ -110,17 +110,17 @@ func refNamesFromImageReference(ctx context.Context, srcRef types.ImageReference
} }
var dest []string var dest []string
if len(manifest[0].RepoTags) > 0 { 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 // 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) dest = append(dest, digest)
} 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
res := []*pullRefName{} res := []*pullRefName{}
for _, dst := range dest { for _, dst := range dest {
pullInfo := getPullRefName(srcRef, dst) pullInfo := getPullRefName(srcRef, dst)