Simplify ExpandNames

No need to hard-code the :tag / @digest syntax when there already is an API returning the string representation. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]> Closes: #1361 Approved by: rhatdan
containers · Feb 27, 2019 · 003a2d2 · 003a2d2
1 parent dcae0ac
commit 003a2d2
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/util/util.go b/util/util.go
@@ -166,15 +166,7 @@ func ExpandNames(names []string, firstRegistry string, systemContext *types.Syst
 			name = named
 		}
 		name = reference.TagNameOnly(name)
-		tag := ""
-		digest := ""
-		if tagged, ok := name.(reference.NamedTagged); ok {
-			tag = ":" + tagged.Tag()
-		}
-		if digested, ok := name.(reference.Digested); ok {
-			digest = "@" + digested.Digest().String()
-		}
-		expanded = append(expanded, name.Name()+tag+digest)
+		expanded = append(expanded, name.String())
 	}
 	return expanded, nil
 }