fixup! Envtest Binary Version Manager Tool

DirectXMan12 · DirectXMan12 · commit 4c197783fcfb · 2021-04-27T17:24:01.000-07:00
diff --git a/tools/setup-envtest/env/env.go b/tools/setup-envtest/env/env.go
@@ -448,8 +448,6 @@ func (e *Env) PathMatches(value string) bool {
 	e.Platform.Arch = "*"
 	e.manualPath = value
 	return true
-
-	return false
 }
 
 // versionFromPathName checks if the given path's last component looks like one
diff --git a/tools/setup-envtest/main.go b/tools/setup-envtest/main.go
@@ -102,6 +102,8 @@ func setupEnv(globalLog logr.Logger, version string) *envp.Env {
 	case "", "latest":
 		env.Version = versions.LatestVersion
 	case "latest-on-disk":
+		// we sort by version, latest first, so this'll give us the latest on
+		// disk (as per the contract from env.List & store.List)
 		env.Version = versions.AnyVersion
 		env.NoDownload = true
 	default:

Original file line number	Diff line number	Diff line change
`@@ -448,8 +448,6 @@ func (e *Env) PathMatches(value string) bool {`
`448`	`448`	`e.Platform.Arch = "*"`
`449`	`449`	`e.manualPath = value`
`450`	`450`	`return true`
`451`		`-`
`452`		`- return false`
`453`	`451`	`}`
`454`	`452`
`455`	`453`	`// versionFromPathName checks if the given path's last component looks like one`