diff options
author | Nathan Harmata <nharmata@google.com> | 2015-03-16 22:59:39 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2015-03-18 13:41:00 +0000 |
commit | 7ad1e0e5cc16c7654711938534a9729729d05ac7 (patch) | |
tree | 5a684fd67a017fab5d724aa0beb547dc95ac4846 /src | |
parent | 934e452153da7baa5711d8f7828031badad45bca (diff) |
Emit events (e.g. errors) encountered while parsing the WORKSPACE file.
--
MOS_MIGRATED_REVID=88774665
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java | 7 |
1 files changed, 3 insertions, 4 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 5378af5808..034bf3b50a 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 @@ -117,7 +117,7 @@ public class WorkspaceFileFunction implements SkyFunction { if (buildFileAST.containsErrors()) { localReporter.handle(Event.error("WORKSPACE file could not be parsed")); } else { - if (!evaluateWorkspaceFile(buildFileAST, builder)) { + if (!evaluateWorkspaceFile(buildFileAST, builder, localReporter)) { localReporter.handle( Event.error("Error evaluating WORKSPACE file " + workspaceFilePath)); } @@ -201,8 +201,8 @@ public class WorkspaceFileFunction implements SkyFunction { }; } - public boolean evaluateWorkspaceFile(BuildFileAST buildFileAST, Builder builder) - throws InterruptedException { + public boolean evaluateWorkspaceFile(BuildFileAST buildFileAST, Builder builder, + StoredEventHandler eventHandler) throws InterruptedException { // Environment is defined in SkyFunction and the syntax package. com.google.devtools.build.lib.syntax.Environment workspaceEnv = new com.google.devtools.build.lib.syntax.Environment(); @@ -221,7 +221,6 @@ public class WorkspaceFileFunction implements SkyFunction { workspaceEnv.update(BIND, newBindFunction(builder)); workspaceEnv.update("workspace", newWorkspaceNameFunction(builder)); - StoredEventHandler eventHandler = new StoredEventHandler(); return buildFileAST.exec(workspaceEnv, eventHandler); } |