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

Simplify pullGoalFromPossiblyUnqualifiedName

Browse Source 
After inlining assembleWithTransport, we have two branches with
the same prepending of decomposedImage.transport; move that out of
the branches.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2019-01-09 18:54:17 +01:00
parent 3d98c42a3f
commit 99d2259f8a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/image/pull.go
View File

@ -286,11 +286,11 @@ func (ir *Runtime) pullGoalFromPossiblyUnqualifiedName(inputName string) (*pullG
if decomposedImage.hasRegistry { if decomposedImage.hasRegistry {
var imageName, destName string var imageName, destName string
if hasShaInInputName(inputName) { if hasShaInInputName(inputName) {
imageName = fmt.Sprintf("%s%s", decomposedImage.transport, inputName) imageName = inputName
} else { } else {
imageName = fmt.Sprintf("%s%s", decomposedImage.transport, decomposedImage.assemble()) imageName = decomposedImage.assemble()
} }
srcRef, err := alltransports.ParseImageName(imageName) srcRef, err := alltransports.ParseImageName(fmt.Sprintf("%s%s", decomposedImage.transport, imageName))
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "unable to parse '%s'", inputName) return nil, errors.Wrapf(err, "unable to parse '%s'", inputName)
} }
@ -318,11 +318,11 @@ func (ir *Runtime) pullGoalFromPossiblyUnqualifiedName(inputName string) (*pullG
var refPairs []pullRefPair var refPairs []pullRefPair
for _, registry := range searchRegistries { for _, registry := range searchRegistries {
decomposedImage.registry = registry decomposedImage.registry = registry
imageName := fmt.Sprintf("%s%s", decomposedImage.transport, decomposedImage.assemble()) imageName := decomposedImage.assemble()
if hasShaInInputName(inputName) { if hasShaInInputName(inputName) {
imageName = fmt.Sprintf("%s%s/%s", decomposedImage.transport, registry, inputName) imageName = fmt.Sprintf("%s/%s", registry, inputName)
} }
srcRef, err := alltransports.ParseImageName(imageName) srcRef, err := alltransports.ParseImageName(fmt.Sprintf("%s%s", decomposedImage.transport, imageName))
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "unable to parse '%s'", inputName) return nil, errors.Wrapf(err, "unable to parse '%s'", inputName)
} }