1 files changed, 38 insertions, 5 deletions

diff --git a/libpod/image/utils.go b/libpod/image/utils.go
index ad027f32a..544796a4b 100644
--- a/libpod/image/utils.go
+++ b/libpod/image/utils.go
@@ -1,6 +1,7 @@
 package image
 
 import (
+	"fmt"
 	"io"
 	"net/url"
 	"regexp"
@@ -87,22 +88,29 @@ func hasTransport(image string) bool {
 
 // ReposToMap parses the specified repotags and returns a map with repositories
 // as keys and the corresponding arrays of tags as values.
-func ReposToMap(repotags []string) map[string][]string {
+func ReposToMap(repotags []string) (map[string][]string, error) {
 	// map format is repo -> tag
 	repos := make(map[string][]string)
 	for _, repo := range repotags {
 		var repository, tag string
 		if len(repo) > 0 {
-			li := strings.LastIndex(repo, ":")
-			repository = repo[0:li]
-			tag = repo[li+1:]
+			named, err := reference.ParseNormalizedNamed(repo)
+			repository = named.Name()
+			if err != nil {
+				return nil, err
+			}
+			if ref, ok := named.(reference.NamedTagged); ok {
+				tag = ref.Tag()
+			} else if ref, ok := named.(reference.Canonical); ok {
+				tag = ref.Digest().String()
+			}
 		}
 		repos[repository] = append(repos[repository], tag)
 	}
 	if len(repos) == 0 {
 		repos["<none>"] = []string{"<none>"}
 	}
-	return repos
+	return repos, nil
 }
 
 // GetAdditionalTags returns a list of reference.NamedTagged for the
@@ -141,3 +149,28 @@ func IsValidImageURI(imguri string) (bool, error) {
 	}
 	return true, nil
 }
+
+// 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 *Image, imgUserInput string) string {
+	if strings.Contains(img.ID(), imgUserInput) {
+		return ""
+	}
+
+	prepend := ""
+	localRegistryPrefix := fmt.Sprintf("%s/", DefaultLocalRegistry)
+	if !strings.HasPrefix(imgUserInput, localRegistryPrefix) {
+		// we need to check if localhost was added to the image name in NewFromLocal
+		for _, name := range img.Names() {
+			// If the user is saving an image in the localhost registry,  getLocalImage need
+			// a name that matches the format localhost/<tag1>:<tag2> or localhost/<tag>:latest to correctly
+			// set up the manifest and save.
+			if strings.HasPrefix(name, localRegistryPrefix) && (strings.HasSuffix(name, imgUserInput) || strings.HasSuffix(name, fmt.Sprintf("%s:latest", imgUserInput))) {
+				prepend = localRegistryPrefix
+				break
+			}
+		}
+	}
+	return fmt.Sprintf("%s%s", prepend, imgUserInput)
+}