Merge pull request moby#40647 from thaJeztah/simplify_is_abs

kolyshkin · web-flow · commit 26f8c7de91d6 · 2020-03-11T10:52:49.000-07:00
pkg/system: minor linting issues and refactor
diff --git a/pkg/system/filesys_windows.go b/pkg/system/filesys_windows.go
@@ -130,12 +130,10 @@ func mkdirWithACL(name string, sddl string) error {
 // by the daemon. This SHOULD be treated as absolute from a docker processing
 // perspective.
 func IsAbs(path string) bool {
-	if !filepath.IsAbs(path) {
-		if !strings.HasPrefix(path, string(os.PathSeparator)) {
-			return false
-		}
+	if filepath.IsAbs(path) || strings.HasPrefix(path, string(os.PathSeparator)) {
+		return true
 	}
-	return true
+	return false
 }
 
 // The origin of the functions below here are the golang OS and windows packages,
diff --git a/pkg/system/path_windows_test.go b/pkg/system/path_windows_test.go
@@ -12,7 +12,7 @@ import (
 func TestCheckSystemDriveAndRemoveDriveLetter(t *testing.T) {
 	// Fails if not C drive.
 	_, err := CheckSystemDriveAndRemoveDriveLetter(`d:\`, pathdriver.LocalPathDriver)
-	if err == nil || (err != nil && err.Error() != "The specified path is not on the system drive (C:)") {
+	if err == nil || err.Error() != "The specified path is not on the system drive (C:)" {
 		t.Fatalf("Expected error for d:")
 	}
 
diff --git a/pkg/system/process_windows.go b/pkg/system/process_windows.go
@@ -13,6 +13,6 @@ func IsProcessAlive(pid int) bool {
 func KillProcess(pid int) {
 	p, err := os.FindProcess(pid)
 	if err == nil {
-		p.Kill()
+		_ = p.Kill()
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`func TestCheckSystemDriveAndRemoveDriveLetter(t *testing.T) {`
`13`	`13`	`// Fails if not C drive.`
`14`	`14`	_, err := CheckSystemDriveAndRemoveDriveLetter(`d:\`, pathdriver.LocalPathDriver)
`15`		`- if err == nil \|\| (err != nil && err.Error() != "The specified path is not on the system drive (C:)") {`
	`15`	`+ if err == nil \|\| err.Error() != "The specified path is not on the system drive (C:)" {`
`16`	`16`	`t.Fatalf("Expected error for d:")`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ func IsProcessAlive(pid int) bool {`
`13`	`13`	`func KillProcess(pid int) {`
`14`	`14`	`p, err := os.FindProcess(pid)`
`15`	`15`	`if err == nil {`
`16`		`- p.Kill()`
	`16`	`+ _ = p.Kill()`
`17`	`17`	`}`
`18`	`18`	`}`