diff options
| author |  neerajen <neerajen@google.com> | 2018-05-31 11:54:25 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-31 11:56:07 -0700 |
| commit | 22d79ae6c69c99e4351963e988902a9135a55239 (patch) | |
| tree | f5a6d7a51f82213e5435624f6ad93bacafcef24e /src/main/java/com/google/devtools/common | |
| parent | 488a3e3d6caf61536b6ca2a88acfc8605d6a442d (diff) | |
Log warning cleanup
Setting --config in .blazerc that overrode previous options in .blazerc was triggering unnecessary warnings. Fixed by only logging warnings when a user attempts to override an option specified on the command line.
RELNOTES: None.
PiperOrigin-RevId: 198756160
Diffstat (limited to 'src/main/java/com/google/devtools/common')
| -rw-r--r-- | src/main/java/com/google/devtools/common/options/OptionValueDescription.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/common/options/OptionValueDescription.java b/src/main/java/com/google/devtools/common/options/OptionValueDescription.java index 11ad7fef4d..a54893b1c3 100644 --- a/src/main/java/com/google/devtools/common/options/OptionValueDescription.java +++ b/src/main/java/com/google/devtools/common/options/OptionValueDescription.java @@ -18,6 +18,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ListMultimap; +import com.google.devtools.common.options.OptionPriority.PriorityCategory; import com.google.devtools.common.options.OptionsParser.ConstructionException; import java.util.Collection; import java.util.Comparator; @@ -221,6 +222,10 @@ public abstract class OptionValueDescription { + "option by %s", optionDefinition, optionThatDependsOnEffectiveValue)); } else if (samePriorityCategory + && parsedOption + .getPriority() + .getPriorityCategory() + .equals(PriorityCategory.COMMAND_LINE) && ((optionThatExpandedToEffectiveValue == null) && (expandedFrom != null))) { // Create a warning if an expansion option overrides an explicit option: warnings.add( |