diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java index e99a8d6f6b..91e218beac 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java +++ b/src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java @@ -39,7 +39,6 @@ public final class WindowsLocalEnvProvider implements LocalEnvProvider { * TEMP (or adds them if not present in {@code env}) by the same value, which is: * * <ul> - * <li>the value of {@code localTmpRoot}, or if that's empty or null, then * <li>the value of {@code clientEnv.get("TMP")}, or if that's empty or null, then * <li>the value of {@code clientEnv.get("TEMP")}, or if that's empty or null, then * <li>the value of {@code fallbackTmpDir}. @@ -49,21 +48,14 @@ public final class WindowsLocalEnvProvider implements LocalEnvProvider { */ @Override public Map<String, String> rewriteLocalEnv( - Map<String, String> env, - Path execRoot, - String localTmpRoot, - String fallbackTmpDir, - String productName) { + Map<String, String> env, Path execRoot, String fallbackTmpDir, String productName) { ImmutableMap.Builder<String, String> result = ImmutableMap.builder(); result.putAll(Maps.filterKeys(env, k -> !k.equals("TMP") && !k.equals("TEMP"))); - String p = localTmpRoot; + String p = clientEnv.get("TMP"); if (Strings.isNullOrEmpty(p)) { - p = clientEnv.get("TMP"); + p = clientEnv.get("TEMP"); if (Strings.isNullOrEmpty(p)) { - p = clientEnv.get("TEMP"); - if (Strings.isNullOrEmpty(p)) { - p = fallbackTmpDir; - } + p = fallbackTmpDir; } } p = p.replace('/', '\\'); |