aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
diff options
context:
space:
mode:
authorGravatar Kristina Chodorow <kchodorow@google.com>2016-01-06 20:31:03 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2016-01-07 13:46:57 +0000
commitf627562e351717b1b207f0afb65c4f855bf664ef (patch)
tree2e8de96c8880c657697f6aa7e21b9cb04b7aa580 /src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
parenteb0d376beb618790c0526e80df5375248e875b8c (diff)
Stop parsing the WORKSPACE file when a parse error is detected
Parsing was continuing and tried to load skylark extensions even though an error was present in the WORKSPACE file. Fixes #724 -- MOS_MIGRATED_REVID=111534382
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.java5
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 84db2d3c8f..08514baad9 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
@@ -118,8 +118,9 @@ public class WorkspaceFileFunction implements SkyFunction {
}
private boolean parse(ParserInputSource source, Path repoWorkspace, WorkspaceFactory parser,
- Environment skyEnvironment) throws PackageFunctionException, InterruptedException {
- parser.parseBuildFile(source);
+ Environment skyEnvironment)
+ throws PackageFunctionException, InterruptedException, IOException {
+ parser.parseWorkspaceFile(source);
if (!loadSkylarkImports(repoWorkspace, parser, skyEnvironment)) {
return false;
}