diff options
| author |  John Cater <jcater@google.com> | 2017-02-28 11:06:43 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-02-28 11:34:27 +0000 |
| commit | 5f19fd5f82583205c950dad024ebe014267a03b9 (patch) | |
| tree | 0bbc06ca7229dd6ab37149fde1920ae72594df6c /src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java | |
| parent | 1409aa313aa65804697e7ef5413315e8c38a2f91 (diff) | |
Add check that the WORKSPACE found in LocalRepositoryLookupFunction isn't a directory.
Fixes #2580.
--
Change-Id: I6e1271a9c1442819e956f7fcdcb5da535ed027db
Reviewed-on: https://cr.bazel.build/9110
PiperOrigin-RevId: 148751072
MOS_MIGRATED_REVID=148751072
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java index cafcfbfebf..e134350061 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java @@ -105,6 +105,10 @@ public class LocalRepositoryLookupFunction implements SkyFunction { if (workspaceFileValue == null) { return Optional.absent(); } + if (workspaceFileValue.isDirectory()) { + // There is a directory named WORKSPACE, ignore it for checking repository existence. + return Optional.of(false); + } return Optional.of(workspaceFileValue.exists()); } catch (IOException e) { throw new LocalRepositoryLookupFunctionException( |