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

better to limit the scope of err 

Signed-off-by: Will Wang <willww64@gmail.com>
This commit is contained in:
Will Wang 2024-07-24 14:36:34 +08:00
parent 40df26561b
commit a85a37e3f3
No known key found for this signature in database
GPG Key ID: 777CB89880638858
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/config/configfile/file.go
View File

@ -167,10 +167,9 @@ func (configFile *ConfigFile) Save() (retErr error) {
return errors.Wrap(err, "error closing temp file") return errors.Wrap(err, "error closing temp file")
} }
cfgFile := configFile.Filename
// Handle situations where `configFile.Filename` is a symlink, and allow for dangling symlinks // Handle situations where `configFile.Filename` is a symlink, and allow for dangling symlinks
f, err := filepath.EvalSymlinks(cfgFile) cfgFile := configFile.Filename
if err == nil { if f, err := filepath.EvalSymlinks(cfgFile); err == nil {
cfgFile = f cfgFile = f
} else if os.IsNotExist(err) { } else if os.IsNotExist(err) {
// extract the path from the error if `cfgFile` does not exist or is a dangling symlink // extract the path from the error if `cfgFile` does not exist or is a dangling symlink