diff options
| author |  kush <kush@google.com> | 2017-08-16 20:01:53 +0200 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-08-17 09:53:43 +0200 |
| commit | d5a892a7cc20220a453c298baa87da9c5ccc7e02 (patch) | |
| tree | 759c67f7637ed7c0cecea312b572d88460aa759f /src/main/java/com/google/devtools/build/lib/skyframe | |
| parent | 1f5a0ec3b12241e98587813e33052654b250460e (diff) | |
Fix skyframe-native filesets to honor 'excludes' while in a directory traversal.
RELNOTES: None
PiperOrigin-RevId: 165465128
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java index fe23f379b4..58dd224cc3 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java @@ -170,7 +170,9 @@ public final class FilesetEntryFunction implements SkyFunction { // Check whether the symlink is excluded before attempting to resolve it. // It may be dangling, but excluding it is still fine. - if (exclusions.contains(linkName.getPathString())) { + // TODO(b/64754128): Investigate if we could have made the exclude earlier before + // unnecessarily iterating over all the files in an excluded directory. + if (linkName.segmentCount() > 0 && exclusions.contains(linkName.getSegment(0))) { continue; } |