diff options
author | Lukacs Berki <lberki@google.com> | 2015-09-24 07:48:36 +0000 |
---|---|---|
committer | Philipp Wollermann <philwo@google.com> | 2015-09-24 14:21:47 +0000 |
commit | 960dc27e8cfecec2448b92810dfa14d3ce4f2f1e (patch) | |
tree | d3ba11f45770e89303c8857f0ad21a751a17db90 /src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java | |
parent | 402d112bc25449f1e690bbbace600bbcda834d24 (diff) |
Make intra-package wildcards work for remote repositories and clean up target pattern parsing just a tiny little bit.
This wounds #389 dealing 4d6 fire damage (recursive wildcards, e.g. /... and friends still don't work)
--
MOS_MIGRATED_REVID=103822319
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java index a48117f757..34f5f0474a 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java @@ -131,7 +131,7 @@ public class PrepareDepsOfPatternFunction implements SkyFunction { } @Override - public Void getTargetOrNull(String targetName) throws InterruptedException { + public Void getTargetOrNull(Label label) throws InterruptedException { // Note: // This method is used in just one place, TargetPattern.TargetsInPackage#getWildcardConflict. // Returning null tells #getWildcardConflict that there is not a target with a name like @@ -142,9 +142,8 @@ public class PrepareDepsOfPatternFunction implements SkyFunction { } @Override - public ResolvedTargets<Void> getExplicitTarget(String targetName) + public ResolvedTargets<Void> getExplicitTarget(Label label) throws TargetParsingException, InterruptedException { - Label label = TargetPatternResolverUtil.label(targetName); try { Target target = packageProvider.getTarget(env.getListener(), label); SkyKey key = TransitiveTraversalValue.key(target.getLabel()); |