diff options
| author |  lberki <lberki@google.com> | 2018-03-26 01:31:23 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-26 01:32:40 -0700 |
| commit | c2c7645922269ac4adc0720f129380c101842133 (patch) | |
| tree | 45bdd1d3dde16b8d8fe2829a350f7081d361c370 /src/main/java/com/google/devtools/build/lib/util | |
| parent | bffa2db380cb3ca2fd9262ac5a45d02518376e03 (diff) | |
Make the script written blaze "blaze run --direct_run --script_path" not overwrite the environment of their caller.
Admittedly, doing that was a bad idea in the first place.
RELNOTES: None.
PiperOrigin-RevId: 190430189
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/util')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/util/CommandFailureUtils.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/util/CommandFailureUtils.java b/src/main/java/com/google/devtools/build/lib/util/CommandFailureUtils.java index 20d83d7cfe..dad0d72db6 100644 --- a/src/main/java/com/google/devtools/build/lib/util/CommandFailureUtils.java +++ b/src/main/java/com/google/devtools/build/lib/util/CommandFailureUtils.java @@ -38,7 +38,7 @@ public class CommandFailureUtils { void describeCommandBeginIsolate(StringBuilder message); void describeCommandEndIsolate(StringBuilder message); void describeCommandCwd(String cwd, StringBuilder message); - void describeCommandEnvPrefix(StringBuilder message); + void describeCommandEnvPrefix(StringBuilder message, boolean isolated); void describeCommandEnvVar(StringBuilder message, Map.Entry<String, String> entry); void describeCommandElement(StringBuilder message, String commandElement); void describeCommandExec(StringBuilder message); @@ -62,8 +62,10 @@ public class CommandFailureUtils { } @Override - public void describeCommandEnvPrefix(StringBuilder message) { - message.append("env - \\\n "); + public void describeCommandEnvPrefix(StringBuilder message, boolean isolated) { + message.append(isolated + ? "env - \\\n " + : "env \\\n "); } @Override @@ -103,7 +105,7 @@ public class CommandFailureUtils { } @Override - public void describeCommandEnvPrefix(StringBuilder message) { } + public void describeCommandEnvPrefix(StringBuilder message, boolean isolated) { } @Override public void describeCommandEnvVar(StringBuilder message, Map.Entry<String, String> entry) { @@ -182,7 +184,8 @@ public class CommandFailureUtils { * (in ProcessEnvironment.StringEnvironment.toEnvironmentBlock()). */ if (environment != null) { - describeCommandImpl.describeCommandEnvPrefix(message); + describeCommandImpl.describeCommandEnvPrefix( + message, form != CommandDescriptionForm.COMPLETE_UNISOLATED); // A map can never have two keys with the same value, so we only need to compare the keys. Comparator<Map.Entry<String, String>> mapEntryComparator = comparingByKey(); for (Map.Entry<String, String> entry : |