diff options
| author |  mschaller <mschaller@google.com> | 2017-07-26 20:12:30 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-27 09:05:15 +0200 |
| commit | 684d120e6c3b32ddc99e115c54cdbff64f6c519f (patch) | |
| tree | 2d1b6aace7bbe5d045e950c4ea338799a096b9ef /src/main/java/com/google/devtools/build/lib/skyframe | |
| parent | 403010f45379e0ca6e02c6eb68a79f71fdb18c68 (diff) | |
Fix bug where we incorrectly skip over subdirectories named 'external'. We're actually just trying to skip over packages named '//external'.
PiperOrigin-RevId: 163230119
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java b/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java index 349aec4b15..3b7556b4bd 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java @@ -198,11 +198,11 @@ public class ProcessPackageDirectory { && PathPackageLocator.DEFAULT_TOP_LEVEL_EXCLUDES.contains(basename)) { continue; } - if (basename.equals(Label.EXTERNAL_PACKAGE_NAME.getPathString())) { + PathFragment subdirectory = rootRelativePath.getRelative(basename); + if (subdirectory.equals(Label.EXTERNAL_PACKAGE_NAME)) { // Not a real package. continue; } - PathFragment subdirectory = rootRelativePath.getRelative(basename); // If this subdirectory is one of the excluded paths, don't recurse into it. if (excludedPaths.contains(subdirectory)) { |