Merge pull request #5143 from kevpar/fix-lookpath

fuweid · web-flow · commit a5d17eb5071b · 2021-03-09T12:01:22.000+08:00
Fix error checking when resolving shim binary path
diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go
@@ -70,7 +70,7 @@ func Command(ctx context.Context, runtime, containerdAddress, containerdTTRPCAdd
 		}
 
 		if cmdPath == "" {
-			if cmdPath, lerr = exec.LookPath(name); err != nil {
+			if cmdPath, lerr = exec.LookPath(name); lerr != nil {
 				if eerr, ok := lerr.(*exec.Error); ok {
 					if eerr.Err == exec.ErrNotFound {
 						// LookPath only finds current directory matches based on

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func Command(ctx context.Context, runtime, containerdAddress, containerdTTRPCAdd`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if cmdPath == "" {`
`73`		`- if cmdPath, lerr = exec.LookPath(name); err != nil {`
	`73`	`+ if cmdPath, lerr = exec.LookPath(name); lerr != nil {`
`74`	`74`	`if eerr, ok := lerr.(*exec.Error); ok {`
`75`	`75`	`if eerr.Err == exec.ErrNotFound {`
`76`	`76`	`// LookPath only finds current directory matches based on`