Automated rollback of commit dafe71390340224e06eab0ac7afcebb2f5219f5a.

*** Reason for rollback ***

Breaks Bazel CI (https://ci.bazel.build/job/bazel-tests/1722/)

*** Original change description ***

Report unsuccessful error code if bazel fetch fails in "keep going" mode.

Fixes #3234.

PiperOrigin-RevId: 182042503

1 files changed, 10 insertions, 18 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 aa657dca6e..0c6ca842d4 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,7 +23,6 @@ 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;
@@ -123,17 +122,13 @@ public final class FetchCommand implements BlazeCommand {
                 env.getCommandId().toString()));
 
     // 2. Evaluate expression:
-    QueryEvalResult queryEvalResult = null;
     try {
-      queryEvalResult =
-          queryEnv.evaluateQuery(
-              expr,
-              new ThreadSafeOutputFormatterCallback<Target>() {
-                @Override
-                public void processOutput(Iterable<Target> partialResult) {
-                  // Throw away the result.
-                }
-              });
+      queryEnv.evaluateQuery(expr, new ThreadSafeOutputFormatterCallback<Target>() {
+        @Override
+        public void processOutput(Iterable<Target> partialResult) {
+          // Throw away the result.
+        }
+      });
     } catch (InterruptedException e) {
       env.getReporter()
           .post(
@@ -153,15 +148,12 @@ public final class FetchCommand implements BlazeCommand {
       throw new IllegalStateException(e);
     }
 
-    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().handle(
+        Event.progress("All external dependencies fetched successfully."));
     env.getReporter()
         .post(
             new NoBuildRequestFinishedEvent(
-                exitCode, env.getRuntime().getClock().currentTimeMillis()));
-    return exitCode;
+                ExitCode.SUCCESS, env.getRuntime().getClock().currentTimeMillis()));
+    return ExitCode.SUCCESS;
   }
 }