summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2018-07-28 07:58:46 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-01 18:22:59 +0000
commit04f3a9079c5dac0f88ce19c22a7f8761334fee90 (patch)
treeeea322b33df73732cf12cee73bdddb0734528af4
parent85cb582f8675fb1aca2c156b1dbc41e8b12d58cf (diff)
downloadpodman-04f3a9079c5dac0f88ce19c22a7f8761334fee90.tar.gz
podman-04f3a9079c5dac0f88ce19c22a7f8761334fee90.tar.bz2
podman-04f3a9079c5dac0f88ce19c22a7f8761334fee90.zip
Rename the "image" variable to "imageName"
... so that it does not shadow the libpod/image module. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com> Closes: #1176 Approved by: rhatdan
-rw-r--r--cmd/podman/load.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/load.go b/cmd/podman/load.go
index 565b09184..fd3b317b7 100644
--- a/cmd/podman/load.go
+++ b/cmd/podman/load.go
@@ -45,10 +45,10 @@ var (
func loadCmd(c *cli.Context) error {
args := c.Args()
- var image string
+ var imageName string
if len(args) == 1 {
- image = args[0]
+ imageName = args[0]
}
if len(args) > 1 {
return errors.New("too many arguments. Requires exactly 1")
@@ -109,8 +109,8 @@ func loadCmd(c *cli.Context) error {
if err != nil {
// generate full src name with specified image:tag
fullSrc := libpod.OCIArchive + ":" + input
- if image != "" {
- fullSrc = fullSrc + ":" + image
+ if imageName != "" {
+ fullSrc = fullSrc + ":" + imageName
}
newImages, err = runtime.ImageRuntime().LoadFromArchive(ctx, fullSrc, c.String("signature-policy"), writer)
if err != nil {