diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-15 12:50:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 12:50:48 +0100 |
| commit | 92dbcb8841abae35658e5da1bf6eddee7669ea75 (patch) | |
| tree | a0544ba444109eb5a8f252c8821828282225d8ad /cmd/podman/shared/create_cli.go | |
| parent | 9e9b157aa925d8d427999389aabf915dcad83355 (diff) | |
| parent | 36a0ed9702bf4e6ef50650404c838a26f13ba879 (diff) | |
| download | podman-92dbcb8841abae35658e5da1bf6eddee7669ea75.tar.gz podman-92dbcb8841abae35658e5da1bf6eddee7669ea75.tar.bz2 podman-92dbcb8841abae35658e5da1bf6eddee7669ea75.zip | |
Merge pull request #5217 from mheon/rework_label_parsing
Rework label parsing
Diffstat (limited to 'cmd/podman/shared/create_cli.go')
| -rw-r--r-- | cmd/podman/shared/create_cli.go | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/cmd/podman/shared/create_cli.go b/cmd/podman/shared/create_cli.go index 00b83906d..10e27350b 100644 --- a/cmd/podman/shared/create_cli.go +++ b/cmd/podman/shared/create_cli.go @@ -4,7 +4,6 @@ import ( "fmt" "strings" - "github.com/containers/libpod/cmd/podman/shared/parse" "github.com/containers/libpod/pkg/cgroups" cc "github.com/containers/libpod/pkg/spec" "github.com/containers/libpod/pkg/sysinfo" @@ -12,16 +11,6 @@ import ( "github.com/sirupsen/logrus" ) -// GetAllLabels ... -func GetAllLabels(labelFile, inputLabels []string) (map[string]string, error) { - labels := make(map[string]string) - labelErr := parse.ReadKVStrings(labels, labelFile, inputLabels) - if labelErr != nil { - return labels, errors.Wrapf(labelErr, "unable to process labels from --label and label-file") - } - return labels, nil -} - // validateSysctl validates a sysctl and returns it. func validateSysctl(strSlice []string) (map[string]string, error) { sysctl := make(map[string]string) |