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

Exit early in the simple case in imageNameForSaveDestination

Browse Source 
... to make it a tiny bit easier to read.

Should not change behavior (but does not add unit tests).

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

Closes: #1176
Approved by: rhatdan
This commit is contained in:
Miloslav Trmač
2018-07-28 03:47:21 +02:00
committed by Atomic Bot
parent b142cc6b4e
commit 18c4e2c835
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/podman/save.go
View File

@ -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)
}