opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-08 14:48:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

label parsing in non-quoted field

Browse Source 
switch from a stringslice to a stringarray for labels to handle quoted
input.

fixes issue #2574

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2019-03-07 17:33:48 -06:00
parent 1b2f8679b8
commit a7606ca5d9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/common.go
View File

@@ -3,7 +3,6 @@ package main
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/spf13/cobra"
"os" "os"
"strings" "strings"
@@ -14,6 +13,7 @@ import (
"github.com/containers/storage" "github.com/containers/storage"
"github.com/fatih/camelcase" "github.com/fatih/camelcase"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra"
) )
var ( var (
@@ -311,7 +311,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
"kernel-memory", "", "kernel-memory", "",
"Kernel memory limit (format: `<number>[<unit>]`, where unit = b, k, m or g)", "Kernel memory limit (format: `<number>[<unit>]`, where unit = b, k, m or g)",
) )
createFlags.StringSliceP( createFlags.StringArrayP(
"label", "l", []string{}, "label", "l", []string{},
"Set metadata on container (default [])", "Set metadata on container (default [])",
) )

2
cmd/podman/create.go
View File

@@ -592,7 +592,7 @@ func parseCreateOpts(ctx context.Context, c *cliconfig.PodmanCommand, runtime *l
} }
// LABEL VARIABLES // 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 { if err != nil {
return nil, errors.Wrapf(err, "unable to process labels") return nil, errors.Wrapf(err, "unable to process labels")
} }