From 0384e217d69ab52539956c85e2a880ffadb4be36 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 28 Feb 2013 14:55:36 +0100
Subject: [PATCH] fix confusion between SDK paths when "use module SDK" option
 is selected and a Python SDK is configured (PY-9021)

---
 .../run/AbstractPythonRunConfiguration.java   | 23 +++++++++++++------
 .../python/run/PythonCommandLineState.java    |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java b/python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java
index b10b80f72648..979decedb251 100644
--- a/python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java
+++ b/python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java
@@ -183,6 +183,15 @@ public abstract class AbstractPythonRunConfiguration<T extends AbstractRunConfig
     return sdkHome;
   }
 
+  public Sdk getSdk() {
+    if (myUseModuleSdk) {
+      return PythonSdkType.findPythonSdk(getModule());
+    }
+    else {
+      return PythonSdkType.findSdkByPath(getSdkHome());
+    }
+  }
+
   public void readExternal(Element element) throws InvalidDataException {
     super.readExternal(element);
     myInterpreterOptions = JDOMExternalizerUtil.readField(element, "INTERPRETER_OPTIONS");
@@ -275,13 +284,13 @@ public abstract class AbstractPythonRunConfiguration<T extends AbstractRunConfig
    * @param commandLine what to patch
    */
   public void patchCommandLine(GeneralCommandLine commandLine) {
-    final String sdk_home = getSdkHome();
-    Sdk sdk = PythonSdkType.findPythonSdk(getModule());
-    if (sdk != null && sdk_home != null) {
-      patchCommandLineFirst(commandLine, sdk_home);
-      patchCommandLineForVirtualenv(commandLine, sdk_home);
-      patchCommandLineForBuildout(commandLine, sdk_home);
-      patchCommandLineLast(commandLine, sdk_home);
+    final String interpreterPath = getInterpreterPath();
+    Sdk sdk = getSdk();
+    if (sdk != null && interpreterPath != null) {
+      patchCommandLineFirst(commandLine, interpreterPath);
+      patchCommandLineForVirtualenv(commandLine, interpreterPath);
+      patchCommandLineForBuildout(commandLine, interpreterPath);
+      patchCommandLineLast(commandLine, interpreterPath);
     }
   }
 
diff --git a/python/src/com/jetbrains/python/run/PythonCommandLineState.java b/python/src/com/jetbrains/python/run/PythonCommandLineState.java
index ee17f05041f7..99fe2d173a87 100644
--- a/python/src/com/jetbrains/python/run/PythonCommandLineState.java
+++ b/python/src/com/jetbrains/python/run/PythonCommandLineState.java
@@ -89,7 +89,7 @@ public abstract class PythonCommandLineState extends CommandLineState {
 
   @Nullable
   public PythonSdkFlavor getSdkFlavor() {
-    return PythonSdkFlavor.getFlavor(myConfig.getSdkHome());
+    return PythonSdkFlavor.getFlavor(myConfig.getInterpreterPath());
   }
 
   @Override
@@ -150,7 +150,7 @@ public abstract class PythonCommandLineState extends CommandLineState {
     PythonRunConfigurationExtensionsManager.getInstance()
       .patchCommandLine(myConfig, runnerSettings, commandLine, getConfigurationSettings().getRunnerId());
 
-    Sdk sdk = PythonSdkType.findSdkByPath(myConfig.getSdkHome());
+    Sdk sdk = PythonSdkType.findSdkByPath(myConfig.getInterpreterPath());
 
 
     final ProcessHandler processHandler;