diff options
Diffstat (limited to 'cmd/kpod')
| -rw-r--r-- | cmd/kpod/load.go | 9 | ||||
| -rw-r--r-- | cmd/kpod/pull.go | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/cmd/kpod/load.go b/cmd/kpod/load.go index 31975fc76..d29da0c06 100644 --- a/cmd/kpod/load.go +++ b/cmd/kpod/load.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "io" "io/ioutil" "os" @@ -101,16 +102,18 @@ func loadCmd(c *cli.Context) error { } src := libpod.DockerArchive + ":" + input - if err := runtime.PullImage(src, options); err != nil { + imgName, err := runtime.PullImage(src, options) + if err != nil { src = libpod.OCIArchive + ":" + input // generate full src name with specified image:tag if image != "" { src = src + ":" + image } - if err := runtime.PullImage(src, options); err != nil { + imgName, err = runtime.PullImage(src, options) + if err != nil { return errors.Wrapf(err, "error pulling %q", src) } } - + fmt.Println("Loaded image: ", imgName) return nil } diff --git a/cmd/kpod/pull.go b/cmd/kpod/pull.go index 399e8c1b4..5726b20f1 100644 --- a/cmd/kpod/pull.go +++ b/cmd/kpod/pull.go @@ -113,6 +113,8 @@ func pullCmd(c *cli.Context) error { Writer: writer, } - return runtime.PullImage(image, options) - + if _, err := runtime.PullImage(image, options); err != nil { + return errors.Wrapf(err, "error pulling image %q", image) + } + return nil } |