aboutsummaryrefslogtreecommitdiff
path: root/libpod/image/pull.go
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2019-01-09 18:47:09 +0100
committerMiloslav Trmač <mitr@redhat.com>2019-01-14 04:07:23 +0100
commit3d98c42a3f7822bf608834505adcffec7f75bf28 (patch)
tree11d29f96b8fb1d18a85abd8d77572cb7dc22e261 /libpod/image/pull.go
parentc19294c0113e4ddea7005bab5d8a31f7ecd6c120 (diff)
downloadpodman-3d98c42a3f7822bf608834505adcffec7f75bf28.tar.gz
podman-3d98c42a3f7822bf608834505adcffec7f75bf28.tar.bz2
podman-3d98c42a3f7822bf608834505adcffec7f75bf28.zip
Inline imageParts.assembleWithTransport into callers
imageParts.transport is a constant, and the design of imageParts is not transport-independent in any sense; we will want to eliminate the transport member entirely. As a first step, drop assembleWithTransport and inline an exact equivalent into all callers. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'libpod/image/pull.go')
-rw-r--r--libpod/image/pull.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index 09935fe7c..82fe0fdd6 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -288,7 +288,7 @@ func (ir *Runtime) pullGoalFromPossiblyUnqualifiedName(inputName string) (*pullG
if hasShaInInputName(inputName) {
imageName = fmt.Sprintf("%s%s", decomposedImage.transport, inputName)
} else {
- imageName = decomposedImage.assembleWithTransport()
+ imageName = fmt.Sprintf("%s%s", decomposedImage.transport, decomposedImage.assemble())
}
srcRef, err := alltransports.ParseImageName(imageName)
if err != nil {
@@ -318,7 +318,7 @@ func (ir *Runtime) pullGoalFromPossiblyUnqualifiedName(inputName string) (*pullG
var refPairs []pullRefPair
for _, registry := range searchRegistries {
decomposedImage.registry = registry
- imageName := decomposedImage.assembleWithTransport()
+ imageName := fmt.Sprintf("%s%s", decomposedImage.transport, decomposedImage.assemble())
if hasShaInInputName(inputName) {
imageName = fmt.Sprintf("%s%s/%s", decomposedImage.transport, registry, inputName)
}