diff options
author | dslomov <dslomov@google.com> | 2018-01-23 02:02:35 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-23 02:04:48 -0800 |
commit | fa54bfa31bb25bbe06925e40ebc7a908c1cd64d9 (patch) | |
tree | f25d6be0955698a7000d0ca070b81c4ee51824d0 /src/main/java | |
parent | 00036c0237028241e9c87f633204bde0682cdc12 (diff) |
Report unsuccessful error code if bazel fetch fails in "keep going" mode.
Fixes #3234.
Rollforward of commit dafe71390340224e06eab0ac7afcebb2f5219f5a with a bugfix
PiperOrigin-RevId: 182903117
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..7581de0eb0 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; } } |