diff options
| author |  ccalvarin <ccalvarin@google.com> | 2017-10-16 22:18:32 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-10-18 10:27:58 +0200 |
| commit | 7cd9e883dd31f54cd505844aa1f1e0ed7bd9f380 (patch) | |
| tree | e72e67a2f22108d490aaf4b5a59e5727e855547d /src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java | |
| parent | b6bf11217c30123827d36a35a3614ba8e200f349 (diff) | |
Track Option placement within a priority category.
An option has precedence over previous options at the same enum-valued priority. Track its placement in this ordering explicitly.
This will allow after-the-fact expansion of expansion options such that they correctly take precedence or not compared to other mentions of the same flag. This is needed to fix --config's expansion.
RELNOTES: None.
PiperOrigin-RevId: 172367996
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java index 86ccfdb004..8f46581ab7 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java @@ -51,7 +51,7 @@ import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.common.options.InvocationPolicyEnforcer; import com.google.devtools.common.options.OpaqueOptionsData; import com.google.devtools.common.options.OptionDefinition; -import com.google.devtools.common.options.OptionPriority; +import com.google.devtools.common.options.OptionPriority.PriorityCategory; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsParsingException; import com.google.devtools.common.options.OptionsProvider; @@ -219,8 +219,8 @@ public class BlazeCommandDispatcher { // Explicit command-line options: List<String> cmdLineAfterCommand = args.subList(1, args.size()); - optionsParser.parseWithSourceFunction(OptionPriority.COMMAND_LINE, - commandOptionSourceFunction, cmdLineAfterCommand); + optionsParser.parseWithSourceFunction( + PriorityCategory.COMMAND_LINE, commandOptionSourceFunction, cmdLineAfterCommand); // Command-specific options from .blazerc passed in via --default_override // and --rc_source. A no-op if none are provided. @@ -818,7 +818,7 @@ public class BlazeCommandDispatcher { rcfileNotes.add(source + ":\n" + " " + inherited + "'" + commandToParse + "' options: " + Joiner.on(' ').join(rcfileOptions)); - optionsParser.parse(OptionPriority.RC_FILE, rcfile, rcfileOptions); + optionsParser.parse(PriorityCategory.RC_FILE, rcfile, rcfileOptions); } } |