From 805885091fbc808c9ebc8f99adc415db57ed3e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Fri, 22 May 2020 02:41:40 +0200 Subject: [PATCH] Clarify imagesToCopy control flow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... and remove one duplicate line. Should not change behavior. Signed-off-by: Miloslav Trmač --- cmd/skopeo/sync.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/cmd/skopeo/sync.go b/cmd/skopeo/sync.go index f86bbd95..d1414b25 100644 --- a/cmd/skopeo/sync.go +++ b/cmd/skopeo/sync.go @@ -417,17 +417,15 @@ func imagesToCopy(source string, transport string, sourceCtx *types.SystemContex } if imageTagged { - desc.TaggedImages = append(desc.TaggedImages, srcRef) - descriptors = append(descriptors, desc) - break - } - - desc.TaggedImages, err = imagesToCopyFromRepo(sourceCtx, srcRef.DockerReference()) - if err != nil { - return descriptors, err - } - if len(desc.TaggedImages) == 0 { - return descriptors, errors.Errorf("No images to sync found in %q", source) + desc.TaggedImages = []types.ImageReference{srcRef} + } else { + desc.TaggedImages, err = imagesToCopyFromRepo(sourceCtx, srcRef.DockerReference()) + if err != nil { + return descriptors, err + } + if len(desc.TaggedImages) == 0 { + return descriptors, errors.Errorf("No images to sync found in %q", source) + } } descriptors = append(descriptors, desc)