From 8096c4274ac57267dace4166ac05d5665b098d95 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Wed, 14 Oct 2015 15:12:23 +0000 Subject: Pass PackageIdentifier through a bit more code in target parsing in preparation for eventually implementing recursive target patterns for remote repositories. -- MOS_MIGRATED_REVID=105412566 --- .../build/lib/skyframe/GraphBackedRecursivePackageProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java') diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java index 5dc6fc3e0b..fffcd38c36 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java @@ -110,7 +110,9 @@ public final class GraphBackedRecursivePackageProvider implements RecursivePacka for (TargetPatternKey patternKey : universeTargetPatternKeys) { TargetPattern pattern = patternKey.getParsedPattern(); boolean isTBD = pattern.getType().equals(Type.TARGETS_BELOW_DIRECTORY); - if (isTBD && pattern.containsBelowDirectory(directory.getRelativePath().getPathString())) { + PackageIdentifier packageIdentifier = PackageIdentifier.create( + repository, directory.getRelativePath()); + if (isTBD && pattern.containsBelowDirectory(packageIdentifier)) { filteringPolicy = pattern.getRulesOnly() ? FilteringPolicies.RULES_ONLY : FilteringPolicies.NO_FILTER; break; -- cgit v1.2.3