containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split a single if statement into two. 

This should not change behavior; it will only make it
easier to show that future code move does not change it (but
does not add unit tets.)

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

Closes: #1176
Approved by: rhatdan
This commit is contained in:
Miloslav Trmač 2018-07-28 03:38:05 +02:00 committed by Atomic Bot
parent 3cebdc68b8
commit a4b15548d1
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/podman/save.go
View File

@ -128,19 +128,21 @@ func saveCmd(c *cli.Context) error {
dest := dst
// need dest to be in the format transport:path:reference for the following transports
if (strings.Contains(dst, libpod.OCIArchive) || strings.Contains(dst, libpod.DockerArchive)) && !strings.Contains(newImage.ID(), source) {
prepend := ""
if !strings.Contains(source, libpodImage.DefaultLocalRepo) {
// we need to check if localhost was added to the image name in NewFromLocal
for _, name := range newImage.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) {
prepend = fmt.Sprintf("%s/", libpodImage.DefaultLocalRepo)
break
if strings.Contains(dst, libpod.OCIArchive) || strings.Contains(dst, libpod.DockerArchive) {
if !strings.Contains(newImage.ID(), source) {
prepend := ""
if !strings.Contains(source, libpodImage.DefaultLocalRepo) {
// we need to check if localhost was added to the image name in NewFromLocal
for _, name := range newImage.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) {
prepend = fmt.Sprintf("%s/", libpodImage.DefaultLocalRepo)
break
}
}
}
dest = fmt.Sprintf("%s:%s%s", dst, prepend, source)
}
dest = fmt.Sprintf("%s:%s%s", dst, prepend, source)
}
if err := newImage.PushImage(getContext(), dest, manifestType, "", "", writer, c.Bool("compress"), libpodImage.SigningOptions{}, &libpodImage.DockerRegistryOptions{}, false, additionaltags); err != nil {
if err2 := os.Remove(output); err2 != nil {