Merge pull request moby#40670 from thaJeztah/fix_linting

thaJeztah · web-flow · commit 5d86e4a8406e · 2020-03-11T20:04:49.000+01:00
fix linting in pkg/mount
diff --git a/pkg/mount/mount.go b/pkg/mount/mount.go
@@ -140,10 +140,9 @@ func RecursiveUnmount(target string) error {
 		if err != nil {
 			if i == len(mounts)-1 { // last mount
 				return err
-			} else {
-				// This is some submount, we can ignore this error for now, the final unmount will fail if this is a real problem
-				logrus.WithError(err).Warnf("Failed to unmount submount %s", m.Mountpoint)
 			}
+			// This is some submount, we can ignore this error for now, the final unmount will fail if this is a real problem
+			logrus.WithError(err).Warnf("Failed to unmount submount %s", m.Mountpoint)
 		}
 
 		logrus.Debugf("Unmounted %s", m.Mountpoint)

Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,9 @@ func RecursiveUnmount(target string) error {`
`140`	`140`	`if err != nil {`
`141`	`141`	`if i == len(mounts)-1 { // last mount`
`142`	`142`	`return err`
`143`		`- } else {`
`144`		`- // This is some submount, we can ignore this error for now, the final unmount will fail if this is a real problem`
`145`		`- logrus.WithError(err).Warnf("Failed to unmount submount %s", m.Mountpoint)`
`146`	`143`	`}`
	`144`	`+ // This is some submount, we can ignore this error for now, the final unmount will fail if this is a real problem`
	`145`	`+ logrus.WithError(err).Warnf("Failed to unmount submount %s", m.Mountpoint)`
`147`	`146`	`}`
`148`	`147`
`149`	`148`	`logrus.Debugf("Unmounted %s", m.Mountpoint)`