From 90abdfdff52a8b243f96639793ab5a3499fed1ab Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Sat, 28 Jul 2018 04:11:15 +0200 Subject: RFC? Hard-code "format" string values instead of using libpod.* transport names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't really want to change the names of the CLI options just because the transport names change (with oci-dir/docker-dir there is no direct correspondence wanyway), and this removes a dependency. Should not change behavior. Signed-off-by: Miloslav Trmač Closes: #1176 Approved by: rhatdan --- cmd/podman/save.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/save.go b/cmd/podman/save.go index a60403b64..6a0d12885 100644 --- a/cmd/podman/save.go +++ b/cmd/podman/save.go @@ -15,7 +15,6 @@ import ( imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/projectatomic/libpod/cmd/podman/libpodruntime" - "github.com/projectatomic/libpod/libpod" libpodImage "github.com/projectatomic/libpod/libpod/image" "github.com/sirupsen/logrus" "github.com/urfave/cli" @@ -106,7 +105,7 @@ func saveCmd(c *cli.Context) error { var destRef types.ImageReference var manifestType string switch c.String("format") { - case libpod.OCIArchive: + case "oci-archive": destImageName := imageNameForSaveDestination(newImage, source) destRef, err = ociarchive.NewReference(output, destImageName) // destImageName may be "" if err != nil { @@ -124,9 +123,7 @@ func saveCmd(c *cli.Context) error { return errors.Wrapf(err, "error getting directory ImageReference for %q", output) } manifestType = manifest.DockerV2Schema2MediaType - case libpod.DockerArchive: - fallthrough - case "": + case "docker-archive", "": dst := output destImageName := imageNameForSaveDestination(newImage, source) if destImageName != "" { -- cgit v1.2.3-54-g00ecf