containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5385 from baude/makemap 

avoid adding to nil map
This commit is contained in:
OpenShift Merge Robot 2020-03-04 11:08:30 -05:00 committed by GitHub
parent 90eef95cb1 822d5a486a
commit ce7ed2205a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/env/env.go vendored
View File

@ -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 // ParseFile parses the specified path for environment variables and returns them
// as a map. // 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() { defer func() {
if err != nil { if err != nil {
err = errors.Wrapf(err, "error parsing env file %q", path) err = errors.Wrapf(err, "error parsing env file %q", path)