diff options
author | Lukacs Berki <lberki@google.com> | 2015-07-08 08:11:30 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2015-07-08 11:42:30 +0000 |
commit | 33aa1e1afd9f0c35f8ccadcf8bf8f29357ca2878 (patch) | |
tree | 859318d2610a0dfe7bc9a3a751a020fa5a1a249e /src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java | |
parent | 9cac1635f82e85765ec6e7e859cf5e270301f892 (diff) |
Make globs work in remote repositories.
This involved quite a few changes, mainly changing a bunch of places where we refer to packages by a PathFragment to PackageIdentifier.
The only wart is the code in PathPackageLocator: ideally, it would just call into PackageLookupFunction. Unfortunately, it is (through globbing and Parser.include) called from within a Skyframe function, and we don't want to have two eval() calls going on at the same time, so we cannot use that.
There is a potential correctness issue there: PathPackageLocator now assumes where external repositories are put and assumes that they are there when it gets control, but my understanding is that the associated RepositoryValue is always evaluated before, so it works out okay.
--
MOS_MIGRATED_REVID=97751539
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, 4 insertions, 1 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 5230d09779..6fbfe574b1 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 @@ -193,7 +193,10 @@ public class PrepareDepsOfPatternFunction implements SkyFunction { @Override public boolean isPackage(String packageName) { - return packageProvider.isPackage(env.getListener(), packageName); + // TODO(bazel-team): this should get the whole PackageIdentifier. Using only the package name + // makes it impossible to use wildcards to refer to targets in remote repositories. + return packageProvider.isPackage(env.getListener(), + PackageIdentifier.createInDefaultRepo(packageName)); } @Override |