container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-21 01:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename the "image" variable to "imageName"

Browse source 
... 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
This commit is contained in:
Miloslav Trmač 2018-07-28 07:58:46 +02:00 committed by Atomic Bot
parent 85cb582f86
commit 04f3a9079c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/podman/load.go
View file

@ -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 {