diff options
author | 2018-01-16 02:43:25 -0800 | |
---|---|---|
committer | 2018-01-16 02:45:25 -0800 | |
commit | dafe71390340224e06eab0ac7afcebb2f5219f5a (patch) | |
tree | 2fe57d053d659f9febc8bf1e27ba2fc415f6a7b6 /src/main/java | |
parent | 5bd53cb609480ca896ca2d011f415b424c63ce63 (diff) |
Report unsuccessful error code if bazel fetch fails in "keep going" mode.
Fixes #3234.
Change-Id: I1bfbe856d35b98995f5a0684fe47c7566b8dd093
PiperOrigin-RevId: 182029085
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java b/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java index 0c6ca842d4..aa657dca6e 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java @@ -23,6 +23,7 @@ import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.query2.AbstractBlazeQueryEnvironment; import com.google.devtools.build.lib.query2.engine.QueryEnvironment.Setting; +import com.google.devtools.build.lib.query2.engine.QueryEvalResult; import com.google.devtools.build.lib.query2.engine.QueryException; import com.google.devtools.build.lib.query2.engine.QueryExpression; import com.google.devtools.build.lib.query2.engine.ThreadSafeOutputFormatterCallback; @@ -122,13 +123,17 @@ public final class FetchCommand implements BlazeCommand { env.getCommandId().toString())); // 2. Evaluate expression: + QueryEvalResult queryEvalResult = null; try { - queryEnv.evaluateQuery(expr, new ThreadSafeOutputFormatterCallback<Target>() { - @Override - public void processOutput(Iterable<Target> partialResult) { - // Throw away the result. - } - }); + queryEvalResult = + queryEnv.evaluateQuery( + expr, + new ThreadSafeOutputFormatterCallback<Target>() { + @Override + public void processOutput(Iterable<Target> partialResult) { + // Throw away the result. + } + }); } catch (InterruptedException e) { env.getReporter() .post( @@ -148,12 +153,15 @@ public final class FetchCommand implements BlazeCommand { throw new IllegalStateException(e); } - env.getReporter().handle( - Event.progress("All external dependencies fetched successfully.")); + if (!queryEvalResult.getSuccess()) { + env.getReporter().handle(Event.progress("All external dependencies fetched successfully.")); + } + ExitCode exitCode = + queryEvalResult.getSuccess() ? ExitCode.SUCCESS : ExitCode.COMMAND_LINE_ERROR; env.getReporter() .post( new NoBuildRequestFinishedEvent( - ExitCode.SUCCESS, env.getRuntime().getClock().currentTimeMillis())); - return ExitCode.SUCCESS; + exitCode, env.getRuntime().getClock().currentTimeMillis())); + return exitCode; } } |