MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Run configuration environment variables should override auto configured ones (PY-17100)

Browse Source
This commit is contained in:
Dmitry Trofimov
2015-11-09 12:27:19 +01:00
parent bc39c5d402
commit 4424c6b82a
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/run/PythonCommandLineState.java
+6 -8
View File
@@ -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();