diff options
| author |  nharmata <nharmata@google.com> | 2017-10-30 14:40:40 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-10-31 10:37:24 -0400 |
| commit | 8d874b0f8fd8b562945e94a4099cf31687afd9f0 (patch) | |
| tree | 23276d1dc0f90bfc9b9ebc1f542b5dfe0bd9e226 /src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java | |
| parent | 1fef5277c8c47dd976e7028890246df612216456 (diff) | |
Fix bug where all three implementations of RecursivePackageProvider#getPackagesUnderDirectory assumed that the given directory needed to be strictly underneath all directories in the given blacklistedSubdirectories set, yet the callsites were calling this method such that the given directory was not-necessarily-strictly underneath the blacklistedSubdirectories.
N.B. There is no end-to-end bug in EnvironmentBackedRecursivePackageProvider because TargetPatternFunction's usage of TargetPattern#eval is always with blacklistedSubdirectories=ImmutableSet.of(). Also note that the existing fast-path in GraphBackedRecursivePackageProvider is dead code because the Preconditions check would fail first :(
RELNOTES: None
PiperOrigin-RevId: 173924216
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java index 2d3025b612..3fee688970 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java @@ -70,7 +70,7 @@ public class RecursivePkgValue implements SkyValue { * A RecursivePkgKey is a tuple of a {@link RootedPath}, {@code rootedPath}, defining the * directory to recurse beneath in search of packages, and an {@link ImmutableSet} of {@link * PathFragment}s, {@code excludedPaths}, relative to {@code rootedPath.getRoot}, defining the - * set of subdirectories beneath {@code rootedPath} to skip. + * set of subdirectories strictly beneath {@code rootedPath} to skip. * * <p>Throws {@link IllegalArgumentException} if {@code excludedPaths} contains any paths that * are equal to {@code rootedPath} or that are not beneath {@code rootedPath}. |