diff options
author | 2015-09-24 07:48:36 +0000 | |
---|---|---|
committer | 2015-09-24 14:21:47 +0000 | |
commit | 960dc27e8cfecec2448b92810dfa14d3ce4f2f1e (patch) | |
tree | d3ba11f45770e89303c8857f0ad21a751a17db90 /src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.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/RecursivePackageProviderBackedTargetPatternResolver.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java index 147a4e7046..25af04ec7f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.cmdline.PackageIdentifier.RepositoryName; import com.google.devtools.build.lib.cmdline.ResolvedTargets; @@ -73,22 +72,20 @@ public class RecursivePackageProviderBackedTargetPatternResolver } @Override - public Target getTargetOrNull(String targetName) throws InterruptedException { + public Target getTargetOrNull(Label label) throws InterruptedException { try { - Label label = Label.parseAbsolute(targetName); if (!isPackage(label.getPackageIdentifier())) { return null; } return recursivePackageProvider.getTarget(eventHandler, label); - } catch (LabelSyntaxException | NoSuchThingException e) { + } catch (NoSuchThingException e) { return null; } } @Override - public ResolvedTargets<Target> getExplicitTarget(String targetName) + public ResolvedTargets<Target> getExplicitTarget(Label label) throws TargetParsingException, InterruptedException { - Label label = TargetPatternResolverUtil.label(targetName); try { Target target = recursivePackageProvider.getTarget(eventHandler, label); return policy.shouldRetain(target, true) |