diff options
author | Laszlo Csomor <laszlocsomor@google.com> | 2017-03-07 11:47:23 +0000 |
---|---|---|
committer | Dmitry Lomov <dslomov@google.com> | 2017-03-07 12:55:53 +0000 |
commit | 94d8f4e9c8c8757aa7ab7c1a7c3e9afb34039127 (patch) | |
tree | 9d5b0c41cd3b73835af38dc1222765ad9db33ee2 /src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java | |
parent | 70cbebe66037b31512c0fb3b2367ce3e98ea8fb1 (diff) |
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: 149403129
MOS_MIGRATED_REVID=149403129
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java | 13 |
1 files changed, 8 insertions, 5 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 fb521aee96..590acbfe2b 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,7 +20,6 @@ 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; @@ -125,10 +124,14 @@ 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 = "If true, ignore the '--client_env' flag, and use the JVM environment instead") + @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. public boolean ignoreClientEnv; @Option(name = "client_cwd", |