From 18c4e2c83574ff1b99f9bf1d2d60d62770378ee3 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Sat, 28 Jul 2018 03:47:21 +0200 Subject: Exit early in the simple case in imageNameForSaveDestination MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... to make it a tiny bit easier to read. Should not change behavior (but does not add unit tests). Signed-off-by: Miloslav Trmač Closes: #1176 Approved by: rhatdan --- cmd/podman/save.go | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/save.go b/cmd/podman/save.go index 6b26ab832..15a7f85c8 100644 --- a/cmd/podman/save.go +++ b/cmd/podman/save.go @@ -148,19 +148,20 @@ func saveCmd(c *cli.Context) error { // which the user referred to as imgUserInput; or an empty string, if there is no appropriate // reference. func imageNameForSaveDestination(img *libpodImage.Image, imgUserInput string) string { - if !strings.Contains(img.ID(), imgUserInput) { - prepend := "" - if !strings.Contains(imgUserInput, libpodImage.DefaultLocalRepo) { - // we need to check if localhost was added to the image name in NewFromLocal - for _, name := range img.Names() { - // if the user searched for the image whose tag was prepended with localhost, we'll need to prepend localhost to successfully search - if strings.Contains(name, libpodImage.DefaultLocalRepo) && strings.Contains(name, imgUserInput) { - prepend = fmt.Sprintf("%s/", libpodImage.DefaultLocalRepo) - break - } + if strings.Contains(img.ID(), imgUserInput) { + return "" + } + + prepend := "" + if !strings.Contains(imgUserInput, libpodImage.DefaultLocalRepo) { + // we need to check if localhost was added to the image name in NewFromLocal + for _, name := range img.Names() { + // if the user searched for the image whose tag was prepended with localhost, we'll need to prepend localhost to successfully search + if strings.Contains(name, libpodImage.DefaultLocalRepo) && strings.Contains(name, imgUserInput) { + prepend = fmt.Sprintf("%s/", libpodImage.DefaultLocalRepo) + break } } - return fmt.Sprintf("%s%s", prepend, imgUserInput) } - return "" + return fmt.Sprintf("%s%s", prepend, imgUserInput) } -- cgit v1.2.3-54-g00ecf