diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-13 09:34:33 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-13 09:34:33 -0800 |
commit | 140ae25c4d0c7ba89a0bb7ae16f81f90d20be535 (patch) | |
tree | a5e30854d0669694556fdde8de43e00d30176d9c /cmd/podman/exists.go | |
parent | 9ada9722ecba373b317e1ab3e9adf716fc777d8d (diff) | |
parent | 43c6da22b976b6050f86dca50564a4c2b08caee0 (diff) | |
download | podman-140ae25c4d0c7ba89a0bb7ae16f81f90d20be535.tar.gz podman-140ae25c4d0c7ba89a0bb7ae16f81f90d20be535.tar.bz2 podman-140ae25c4d0c7ba89a0bb7ae16f81f90d20be535.zip |
Merge pull request #2141 from baude/remotetag
Add darwin support for remote-client
Diffstat (limited to 'cmd/podman/exists.go')
-rw-r--r-- | cmd/podman/exists.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cmd/podman/exists.go b/cmd/podman/exists.go index 2e2559ec7..bd1bc24ec 100644 --- a/cmd/podman/exists.go +++ b/cmd/podman/exists.go @@ -5,6 +5,7 @@ import ( "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/adapter" "github.com/containers/libpod/libpod/image" "github.com/pkg/errors" "github.com/urfave/cli" @@ -66,13 +67,15 @@ func imageExistsCmd(c *cli.Context) error { if len(args) > 1 || len(args) < 1 { return errors.New("you may only check for the existence of one image at a time") } - runtime, err := libpodruntime.GetRuntime(c) + localRuntime, err := adapter.GetRuntime(c) if err != nil { return errors.Wrapf(err, "could not get runtime") } - defer runtime.Shutdown(false) - if _, err := runtime.ImageRuntime().NewFromLocal(args[0]); err != nil { - if errors.Cause(err) == image.ErrNoSuchImage { + defer localRuntime.Runtime.Shutdown(false) + if _, err := localRuntime.NewImageFromLocal(args[0]); err != nil { + //TODO we need to ask about having varlink defined errors exposed + //so we can reuse them + if errors.Cause(err) == image.ErrNoSuchImage || err.Error() == "io.podman.ImageNotFound" { os.Exit(1) } return err |