From 4424c6b82a201fcf13d26ef7ba004cfe0919be4e Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Thu, 5 Nov 2015 16:07:59 +0300
Subject: [PATCH] Run configuration environment variables should override auto
 configured ones (PY-17100)

---
 .../python/run/PythonCommandLineState.java         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/python/src/com/jetbrains/python/run/PythonCommandLineState.java b/python/src/com/jetbrains/python/run/PythonCommandLineState.java
index 67b17b143a56..419bd0c65acd 100644
--- a/python/src/com/jetbrains/python/run/PythonCommandLineState.java
+++ b/python/src/com/jetbrains/python/run/PythonCommandLineState.java
@@ -16,6 +16,7 @@
 package com.jetbrains.python.run;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.intellij.execution.DefaultExecutionResult;
 import com.intellij.execution.ExecutionException;
@@ -51,7 +52,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
 import com.intellij.remote.RemoteProcessControl;
 import com.intellij.util.PlatformUtils;
-import com.intellij.util.containers.HashMap;
 import com.jetbrains.python.console.PyDebugConsoleBuilder;
 import com.jetbrains.python.debugger.PyDebugRunner;
 import com.jetbrains.python.debugger.PyDebuggerOptionsProvider;
@@ -278,16 +278,14 @@ public abstract class PythonCommandLineState extends CommandLineState {
   }
 
   protected static void initEnvironment(Project project, GeneralCommandLine commandLine, PythonRunParams myConfig) {
-    Map<String, String> env = myConfig.getEnvs();
-    if (env == null) {
-      env = new HashMap<String, String>();
-    }
-    else {
-      env = new HashMap<String, String>(env);
-    }
+    Map<String, String> env = Maps.newHashMap();
 
     setupEncodingEnvs(env, commandLine.getCharset());
 
+    if (myConfig.getEnvs() != null) {
+      env.putAll(myConfig.getEnvs());
+    }
+
     addCommonEnvironmentVariables(env);
 
     commandLine.getEnvironment().clear();