diff options
author | Kristina Chodorow <kchodorow@google.com> | 2016-01-14 22:29:37 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-01-15 09:24:00 +0000 |
commit | 3ec6a0ecf535c96f5b5cd9d2c64f6784bbc2b4bb (patch) | |
tree | a508ae74e668d09b7cd3c74e1339713d14011672 /src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java | |
parent | 319fd3a414d3c2bb5fb0539421611df497736847 (diff) |
Display parsing errors for WORKSPACE files
Previously, for some types of errors, you'd just see "WORKSPACE file
could not be parsed" if there was a syntax error (instead of what the
syntax error was).
Change-Id: Ia278cf23b79f8daba02917cdfb4cc515a87080b1
--
Change-Id: Ia278cf23b79f8daba02917cdfb4cc515a87080b1
Reviewed-on: https://github.com/bazelbuild/bazel/pull/774
MOS_MIGRATED_REVID=112190322
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 | 4 |
1 files changed, 4 insertions, 0 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 08514baad9..65060a29e1 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 @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.skyframe; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.cmdline.Label; +import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.packages.Package.LegacyBuilder; import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.RuleClassProvider; @@ -94,6 +95,9 @@ public class WorkspaceFileFunction implements SkyFunction { } catch (PackageFunctionException e) { throw new WorkspaceFileFunctionException(e, Transience.PERSISTENT); } catch (IOException e) { + for (Event event : parser.getEvents()) { + env.getListener().handle(event); + } throw new WorkspaceFileFunctionException(e, Transience.TRANSIENT); } } |