From e8f7442831ed1d5b950eee880b44ffb80348c996 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Fri, 27 Jul 2018 03:36:25 +0200 Subject: Use an early exit if a docker-archive: image has no repo tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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č Closes: #1176 Approved by: rhatdan --- libpod/image/pull.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libpod/image/pull.go') diff --git a/libpod/image/pull.go b/libpod/image/pull.go index 406fa0eaf..378664e83 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -109,18 +109,17 @@ func refNamesFromImageReference(ctx context.Context, srcRef types.ImageReference return []*pullRefName{getPullRefName(srcRef, reference)}, nil } - var dest []string if len(manifest[0].RepoTags) == 0 { // 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) - } else { - // Need to load in all the repo tags from the manifest - dest = append(dest, manifest[0].RepoTags...) + return []*pullRefName{getPullRefName(srcRef, digest)}, nil } + + // Need to load in all the repo tags from the manifest + dest := manifest[0].RepoTags res := []*pullRefName{} for _, dst := range dest { pullInfo := getPullRefName(srcRef, dst) -- cgit v1.2.3-54-g00ecf