dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-03 06:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

volume/local: localVolume.mount() move errors.Wrap()

Browse Source 
While the current code is correct (as errors.Wrap() returns nil if
err is nil), relying on this behavior has caused some confusion in
the past, resulting in regressions.

This patch makes the error-handling code slightly more idiomatic and
defensive against such regressions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2022-05-23 15:48:45 +02:00
parent c1671abf14
commit eecf7a0840
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
volume/local/local_unix.go
View File

@@ -123,13 +123,13 @@ func (v *localVolume) mount() error {
mountOpts = strings.Replace(mountOpts, "addr="+addrValue, "addr="+ipAddr.String(), 1)
}
}
err := mount.Mount(v.opts.MountDevice, v.path, v.opts.MountType, mountOpts)
if err != nil {
if err := mount.Mount(v.opts.MountDevice, v.path, v.opts.MountType, mountOpts); err != nil {
if password := getPassword(v.opts.MountOpts); password != "" {
err = errors.New(strings.Replace(err.Error(), "password="+password, "password=********", 1))
}
return errors.Wrap(err, "failed to mount local volume")
}
return errors.Wrap(err, "failed to mount local volume")
return nil
}
func (v *localVolume) postMount() error {