diff options
author | Miloslav Trmač <mitr@redhat.com> | 2018-07-28 03:45:30 +0200 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-01 18:22:59 +0000 |
commit | b142cc6b4e42fbfd1873b38a9371a7b3a2d76d44 (patch) | |
tree | 3f27c1b3a51ce923cb7296443e549df07a36fbc6 /cmd | |
parent | c27c6c67075b295bb3f0f6ebc6c5919cf208e4e4 (diff) | |
download | podman-b142cc6b4e42fbfd1873b38a9371a7b3a2d76d44.tar.gz podman-b142cc6b4e42fbfd1873b38a9371a7b3a2d76d44.tar.bz2 podman-b142cc6b4e42fbfd1873b38a9371a7b3a2d76d44.zip |
Rename parameters of imageNameForSaveDestination
... to make their relationship clear, at the very least.
Should not change behavior (but does not add unit tests).
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Closes: #1176
Approved by: rhatdan
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/podman/save.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cmd/podman/save.go b/cmd/podman/save.go index 1f4b1ce7f..6b26ab832 100644 --- a/cmd/podman/save.go +++ b/cmd/podman/save.go @@ -144,20 +144,23 @@ func saveCmd(c *cli.Context) error { return nil } -func imageNameForSaveDestination(newImage *libpodImage.Image, source string) string { - if !strings.Contains(newImage.ID(), source) { +// imageNameForSaveDestination returns a Docker-like reference appropriate for saving img, +// 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(source, libpodImage.DefaultLocalRepo) { + if !strings.Contains(imgUserInput, libpodImage.DefaultLocalRepo) { // we need to check if localhost was added to the image name in NewFromLocal - for _, name := range newImage.Names() { + 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, source) { + if strings.Contains(name, libpodImage.DefaultLocalRepo) && strings.Contains(name, imgUserInput) { prepend = fmt.Sprintf("%s/", libpodImage.DefaultLocalRepo) break } } } - return fmt.Sprintf("%s%s", prepend, source) + return fmt.Sprintf("%s%s", prepend, imgUserInput) } return "" } |