diff options
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java index f981715f8a..84d5a20825 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java @@ -206,11 +206,10 @@ public final class CommandEnvironment { } @VisibleForTesting - void updateClientEnv(List<Map.Entry<String, String>> clientEnvList, boolean ignoreClientEnv) { + void updateClientEnv(List<Map.Entry<String, String>> clientEnvList) { Preconditions.checkState(clientEnv.isEmpty()); - Collection<Map.Entry<String, String>> env = - ignoreClientEnv ? System.getenv().entrySet() : clientEnvList; + Collection<Map.Entry<String, String>> env = clientEnvList; for (Map.Entry<String, String> entry : env) { clientEnv.put(entry.getKey(), entry.getValue()); } @@ -557,7 +556,7 @@ public final class CommandEnvironment { this.relativeWorkingDirectory = workingDirectory.relativeTo(workspace); this.workingDirectory = workingDirectory; - updateClientEnv(options.clientEnv, options.ignoreClientEnv); + updateClientEnv(options.clientEnv); // Fail fast in the case where a Blaze command forgets to install the package path correctly. skyframeExecutor.setActive(false); 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..2afb774217 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; @@ -128,7 +127,11 @@ public class CommonCommandOptions extends OptionsBase { @Option(name = "ignore_client_env", defaultValue = "false", category = "hidden", - help = "If true, ignore the '--client_env' flag, and use the JVM environment instead") + deprecationWarning = "Deprecated, no-op.", + help = "Deprecated, no-op." + ) + // TODO(laszlocsomor, dslomov) 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", |