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/pod_create.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/pod_create.go')
| -rw-r--r-- | cmd/podman/pod_create.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/pod_create.go b/cmd/podman/pod_create.go index cee6476ea..0f72780f9 100644 --- a/cmd/podman/pod_create.go +++ b/cmd/podman/pod_create.go @@ -6,6 +6,7 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/shared" + "github.com/containers/libpod/cmd/podman/shared/parse" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/adapter" "github.com/containers/libpod/pkg/errorhandling" @@ -103,7 +104,7 @@ func podCreateCmd(c *cliconfig.PodCreateValues) error { defer errorhandling.SyncQuiet(podIdFile) } - labels, err := shared.GetAllLabels(c.LabelFile, c.Labels) + labels, err := parse.GetAllLabels(c.LabelFile, c.Labels) if err != nil { return errors.Wrapf(err, "unable to process labels") } |