From e68f03ae45adbaa539c7470aa5f99dc870c185dc Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 15 Jan 2019 14:44:46 -0600 Subject: Embed runtime struct in super localRuntime We clean up the code by eliminating stuttering references when we embed the runtime struct into localRuntime. Makes for less change in the future as well. ++ jhonce Signed-off-by: baude --- cmd/podman/images.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cmd/podman/images.go') diff --git a/cmd/podman/images.go b/cmd/podman/images.go index 7f2fb7ae0..031f06618 100644 --- a/cmd/podman/images.go +++ b/cmd/podman/images.go @@ -8,10 +8,9 @@ import ( "time" "unicode" + "github.com/containers/libpod/cmd/podman/formats" "github.com/containers/libpod/cmd/podman/imagefilters" "github.com/containers/libpod/libpod/adapter" - - "github.com/containers/libpod/cmd/podman/formats" "github.com/containers/libpod/libpod/image" "github.com/docker/go-units" "github.com/opencontainers/go-digest" @@ -157,7 +156,7 @@ func imagesCmd(c *cli.Context) error { if err != nil { return errors.Wrapf(err, "Could not get runtime") } - defer runtime.Runtime.Shutdown(false) + defer runtime.Shutdown(false) if len(c.Args()) == 1 { newImage, err = runtime.NewImageFromLocal(c.Args().Get(0)) if err != nil { -- cgit v1.2.3-54-g00ecf