diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-11 11:43:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 11:43:03 -0700 |
| commit | 7038cac53c4c93cd088fdbb097eee8d45494c3b8 (patch) | |
| tree | 958df194bdd61cc209efa0480ea52634149f6250 /cmd/podman/exec.go | |
| parent | b8863b260a7885981def2b02b5acc7c9a209e0c6 (diff) | |
| parent | 651520389d239f335248a27595d39a815ef95238 (diff) | |
| download | podman-7038cac53c4c93cd088fdbb097eee8d45494c3b8.tar.gz podman-7038cac53c4c93cd088fdbb097eee8d45494c3b8.tar.bz2 podman-7038cac53c4c93cd088fdbb097eee8d45494c3b8.zip | |
Merge pull request #2578 from baude/movecreate
preparation for remote-client create container
Diffstat (limited to 'cmd/podman/exec.go')
| -rw-r--r-- | cmd/podman/exec.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/podman/exec.go b/cmd/podman/exec.go index e4cea1f5e..aa81edf56 100644 --- a/cmd/podman/exec.go +++ b/cmd/podman/exec.go @@ -2,16 +2,17 @@ package main import ( "fmt" - "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/spf13/cobra" "io/ioutil" "os" "strconv" + "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" + "github.com/containers/libpod/cmd/podman/shared/parse" "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/rootless" "github.com/pkg/errors" + "github.com/spf13/cobra" ) var ( @@ -130,7 +131,7 @@ func execCmd(c *cliconfig.ExecValues) error { // ENVIRONMENT VARIABLES env := map[string]string{} - if err := readKVStrings(env, []string{}, c.Env); err != nil { + if err := parse.ReadKVStrings(env, []string{}, c.Env); err != nil { return errors.Wrapf(err, "unable to process environment variables") } envs := []string{} |