Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1140 from Vimal-Raghubir/1110-Fix-Warning-Message 

Fix: Warning Message and Fallback search
This commit is contained in:
Vincent Demeester 2018-07-27 07:27:00 +00:00 committed by GitHub
parent b3b2ace735 ce3d069936
commit a3464c0a20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/config/config.go
View File

@ -96,12 +96,12 @@ func Load(configDir string) (*configfile.ConfigFile, error) {
} }
file, err := os.Open(confFile) file, err := os.Open(confFile)
if err != nil { if err != nil {
return configFile, errors.Wrap(err, confFile) return configFile, errors.Wrap(err, filename)
} }
defer file.Close() defer file.Close()
err = configFile.LegacyLoadFromReader(file) err = configFile.LegacyLoadFromReader(file)
if err != nil { if err != nil {
return configFile, errors.Wrap(err, confFile) return configFile, errors.Wrap(err, filename)
} }
return configFile, nil return configFile, nil
} }