summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2017-12-11 13:12:43 -0500
committerGitHub <noreply@github.com>2017-12-11 13:12:43 -0500
commitb85d0fa4ea5b6515088a3475a56a44c0cee5bfc5 (patch)
tree2ad27b4463658539257233963ae6a9c7dc38c168 /cmd
parent12682aa475db17d99eb0cfc5efad20e1b9f3685f (diff)
parent622d5e3b9a09a41f4367d8e038621e3fcbf5c7c7 (diff)
downloadpodman-b85d0fa4ea5b6515088a3475a56a44c0cee5bfc5.tar.gz
podman-b85d0fa4ea5b6515088a3475a56a44c0cee5bfc5.tar.bz2
podman-b85d0fa4ea5b6515088a3475a56a44c0cee5bfc5.zip
Merge pull request #112 from umohnani8/kpod_load
Fix misleading print statement in kpod load
Diffstat (limited to 'cmd')
-rw-r--r--cmd/kpod/load.go9
-rw-r--r--cmd/kpod/pull.go6
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
}