diff options
author | Kristina Chodorow <kchodorow@google.com> | 2015-05-18 17:40:24 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2015-05-18 20:02:24 +0000 |
commit | 88311f87c5b7c1b70499b03093b6088429144cbe (patch) | |
tree | 7019cb878ed9d0bdc3cbb710096de6aba10e2327 /src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java | |
parent | 3e66823d81b6432953f8fa4105a82c3fe605239e (diff) |
Fix WORKSPACE file existence hermeticity
--
MOS_MIGRATED_REVID=93901785
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java index 9d2270864c..8303bd87a6 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java @@ -71,7 +71,8 @@ public class WorkspaceFileFunction implements SkyFunction { public SkyValue compute(SkyKey skyKey, Environment env) throws WorkspaceFileFunctionException, InterruptedException { RootedPath workspaceRoot = (RootedPath) skyKey.argument(); - if (env.getValue(FileValue.key(workspaceRoot)) == null) { + FileValue workspaceFileValue = (FileValue) env.getValue(FileValue.key(workspaceRoot)); + if (workspaceFileValue == null) { return null; } @@ -85,7 +86,7 @@ public class WorkspaceFileFunction implements SkyFunction { } parseWorkspaceFile(installDir.getRelative(workspaceFile), builder); } - if (!repoWorkspace.exists()) { + if (!workspaceFileValue.exists()) { return new PackageValue(builder.build()); } parseWorkspaceFile(repoWorkspace, builder); |