diff options
| author | baude <bbaude@redhat.com> | 2019-03-07 17:33:48 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-03-08 08:17:31 -0600 |
| commit | a7606ca5d92eeba25956362d5c8a7b687e2f52cd (patch) | |
| tree | 0eee79cd4252d8eec22c28335285f6562d2ca32e /cmd | |
| parent | 1b2f8679b864b882fdccaad6fdd6a5c86c83291b (diff) | |
| download | podman-a7606ca5d92eeba25956362d5c8a7b687e2f52cd.tar.gz podman-a7606ca5d92eeba25956362d5c8a7b687e2f52cd.tar.bz2 podman-a7606ca5d92eeba25956362d5c8a7b687e2f52cd.zip | |
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 <bbaude@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common.go | 4 | ||||
| -rw-r--r-- | cmd/podman/create.go | 2 |
2 files changed, 3 insertions, 3 deletions
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: `<number>[<unit>]`, 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") } |