From a7606ca5d92eeba25956362d5c8a7b687e2f52cd Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 7 Mar 2019 17:33:48 -0600 Subject: label parsing in non-quoted field switch from a stringslice to a stringarray for labels to handle quoted input. fixes issue #2574 Signed-off-by: baude --- cmd/podman/common.go | 4 ++-- cmd/podman/create.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd/podman') diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 9cd1998c8..2e9586b60 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -3,7 +3,6 @@ package main import ( "context" "fmt" - "github.com/spf13/cobra" "os" "strings" @@ -14,6 +13,7 @@ import ( "github.com/containers/storage" "github.com/fatih/camelcase" "github.com/pkg/errors" + "github.com/spf13/cobra" ) var ( @@ -311,7 +311,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { "kernel-memory", "", "Kernel memory limit (format: `[]`, where unit = b, k, m or g)", ) - createFlags.StringSliceP( + createFlags.StringArrayP( "label", "l", []string{}, "Set metadata on container (default [])", ) diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 968b5586b..fa8b9f57b 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -592,7 +592,7 @@ func parseCreateOpts(ctx context.Context, c *cliconfig.PodmanCommand, runtime *l } // LABEL VARIABLES - labels, err := getAllLabels(c.StringSlice("label-file"), c.StringSlice("label")) + labels, err := getAllLabels(c.StringSlice("label-file"), c.StringArray("label")) if err != nil { return nil, errors.Wrapf(err, "unable to process labels") } -- cgit v1.2.3-54-g00ecf