diff options
author | Lukacs Berki <lberki@google.com> | 2015-09-25 12:36:12 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2015-09-25 14:42:52 +0000 |
commit | 5de6cac50a3da0e961035396e007d8ca5aa294d0 (patch) | |
tree | ffb323e77aeb1204600f1a275da6cc7c7d01eb85 /src/main/java/com/google/devtools/build/lib/analysis/config | |
parent | b8a6a943212b557b4faa864dc16118a62424e91f (diff) |
Use Label.parseAbsolute() to determine whether command line options that can take absolute paths and labels are labels.
This makes them work with labels not in the main repository (i.e. @repo//pkg:target). The alternative would have been to simply add .startsWith("@"), but why try to parse labels in a lame and limited way if we can do the right thing.
--
MOS_MIGRATED_REVID=103934380
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java | 12 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java b/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java index c231e81310..03f688418d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java @@ -158,14 +158,10 @@ public final class DefaultsPackage { } public static Label parseOptionalLabel(String value) { - if (value.startsWith("//")) { - try { - return Label.parseAbsolute(value); - } catch (LabelSyntaxException e) { - // We ignore this exception here - it will cause an error message at a later time. - return null; - } - } else { + try { + return Label.parseAbsolute(value); + } catch (LabelSyntaxException e) { + // We ignore this exception here - it will cause an error message at a later time. return null; } } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java index 673b3123f9..4ce03493ea 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java @@ -112,7 +112,7 @@ public abstract class FragmentOptions extends OptionsBase implements Cloneable, } private static Label parseOptionalLabel(String value) { - if ((value != null) && value.startsWith("//")) { + if (value != null) { try { return Label.parseAbsolute(value); } catch (LabelSyntaxException e) { |