diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-04 11:08:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 11:08:30 -0500 |
| commit | ce7ed2205a6a2a4557b14a3e1e818839c7c8bbfd (patch) | |
| tree | b37b4867dbe1b8f988485a54cf2119342b12d05b /pkg | |
| parent | 90eef95cb1591f20f5716225cf9b2c8c415fc3fc (diff) | |
| parent | 822d5a486a363eda8fb60478500c028e8bad6799 (diff) | |
| download | podman-ce7ed2205a6a2a4557b14a3e1e818839c7c8bbfd.tar.gz podman-ce7ed2205a6a2a4557b14a3e1e818839c7c8bbfd.tar.bz2 podman-ce7ed2205a6a2a4557b14a3e1e818839c7c8bbfd.zip | |
Merge pull request #5385 from baude/makemap
avoid adding to nil map
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/env/env.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/env/env.go b/pkg/env/env.go index 31ffab03c..9c0ee79db 100644 --- a/pkg/env/env.go +++ b/pkg/env/env.go @@ -62,7 +62,8 @@ func Join(base map[string]string, override map[string]string) map[string]string // ParseFile parses the specified path for environment variables and returns them // as a map. -func ParseFile(path string) (env map[string]string, err error) { +func ParseFile(path string) (_ map[string]string, err error) { + env := make(map[string]string) defer func() { if err != nil { err = errors.Wrapf(err, "error parsing env file %q", path) |