summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-30 21:20:34 +0200
committerGitHub <noreply@github.com>2019-07-30 21:20:34 +0200
commite84ed3c1bca2a35f8b531473dafede7a2c624d0a (patch)
tree42dbcbc54a4c2f5d0f51d6e3aba2c93ee7372a1b /cmd/podman
parent1a008958d42644aaf20e35a79463d9eea366ef55 (diff)
parent2da86bdc3a626f3aebaadbf28c5cc73f80995a78 (diff)
downloadpodman-e84ed3c1bca2a35f8b531473dafede7a2c624d0a.tar.gz
podman-e84ed3c1bca2a35f8b531473dafede7a2c624d0a.tar.bz2
podman-e84ed3c1bca2a35f8b531473dafede7a2c624d0a.zip
Merge pull request #3665 from QiWang19/env
Set -env variables as appropriate
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/shared/parse/parse.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/shared/parse/parse.go b/cmd/podman/shared/parse/parse.go
index 9fbc92fc3..3a75ff7a8 100644
--- a/cmd/podman/shared/parse/parse.go
+++ b/cmd/podman/shared/parse/parse.go
@@ -126,8 +126,9 @@ func parseEnv(env map[string]string, line string) error {
}
} else {
// if only a pass-through variable is given, clean it up.
- val, _ := os.LookupEnv(name)
- env[name] = val
+ if val, ok := os.LookupEnv(name); ok {
+ env[name] = val
+ }
}
}
return nil