cmdline: Get rid of LookPathPrefixes as it is no longer needed.
MultiPart: 1/2
Change-Id: I4d3a906ae516f8081733c4f723c3571bd20599ab
diff --git a/cmdline/cmdline.go b/cmdline/cmdline.go
index 4281b52..da393e1 100644
--- a/cmdline/cmdline.go
+++ b/cmdline/cmdline.go
@@ -68,9 +68,6 @@
ArgsLong string // Long description of the args, shown in help.
LookPath bool // Check for subcommands in PATH.
- // TODO(nlacasse): Remove this once v23->jiri transition is complete.
- LookPathPrefixes []string // Prefix for subcommands in PATH.
-
// Children of the command.
Children []*Command
@@ -321,20 +318,10 @@
}
}
if cmd.LookPath {
- // TODO(nlacasse): Re-enable this once v23->jiri transition is complete.
- // // Look for a matching executable in PATH.
- // subCmd := cmd.Name + "-" + subName
- // if lookPath(subCmd, env.pathDirs()) {
- // return binaryRunner{subCmd, cmdPath}, subArgs, nil
- // }
-
- // Look for a matching executable with prefix in LookPathPrefixes.
- // TODO(nlacasse): Remove this once the v23->jiri transition is complete.
- for _, prefix := range cmd.LookPathPrefixes {
- subCmd := prefix + "-" + subName
- if lookPath(subCmd, env.pathDirs()) {
- return binaryRunner{subCmd, cmdPath}, subArgs, nil
- }
+ // Look for a matching executable in PATH.
+ subCmd := cmd.Name + "-" + subName
+ if lookPath(subCmd, env.pathDirs()) {
+ return binaryRunner{subCmd, cmdPath}, subArgs, nil
}
}
// No matching subcommands, check various error cases.
diff --git a/cmdline/cmdline_test.go b/cmdline/cmdline_test.go
index 4eb1d70..69d687c 100644
--- a/cmdline/cmdline_test.go
+++ b/cmdline/cmdline_test.go
@@ -2467,8 +2467,6 @@
Short: "Short description of command unlikely",
Long: "Long description of command unlikely.",
LookPath: true,
- // TODO(nlacasse): Get rid of this once v23->jiri transition is complete.
- LookPathPrefixes: []string{"unlikely"},
Children: []*Command{
&Command{
Runner: RunnerFunc(runHello),
