Rollback of commit 94d8f4e9c8c8757aa7ab7c1a7c3e9afb34039127.

*** Reason for rollback ***

broke //src/test/shell/bazel:bazel_bootstrap_distfile_test

*** Original change description ***

Env.vars: server won't ignore the client env

Make the --ignore_client_env flag a no-op.
The client will pass --client_env flags to the
server even in --batch mode. This simplifies the
code as well as ensuring that the server always
uses the up-do-date client environment.

We'll gradually get rid of all System.getenv calls
in the server, because the server should always
respect the client env.

--
PiperOrigin-RevId: 149416602
MOS_MIGRATED_REVID=149416602

1 files changed, 5 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java
index 590acbfe2b..fb521aee96 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java
@@ -20,6 +20,7 @@ import com.google.devtools.common.options.Converters;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParsingException;
+
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
@@ -124,14 +125,10 @@ public class CommonCommandOptions extends OptionsBase {
       help = "A system-generated parameter which specifies the client's environment")
   public List<Map.Entry<String, String>> clientEnv;
 
-  @Option(
-    name = "ignore_client_env",
-    defaultValue = "false",
-    category = "hidden",
-    help = "Deprecated, no-op."
-  )
-  // TODO(laszlocsomor) 2017-03-07: remove this flag after 2017-06-01 (~3 months from now) and all
-  // of its occurrences.
+  @Option(name = "ignore_client_env",
+      defaultValue = "false",
+      category = "hidden",
+      help = "If true, ignore the '--client_env' flag, and use the JVM environment instead")
   public boolean ignoreClientEnv;
 
   @Option(name = "client_cwd",