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

fix confusion between SDK paths when "use module SDK" option is selected and a Python SDK is configured (PY-9021)

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-02-28 14:59:45 +01:00
parent 95c61f72da
commit 0384e217d6
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java
+16 -7
View File
@@ -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);
}
}
python/src/com/jetbrains/python/run/PythonCommandLineState.java
+2 -2
View File
@@ -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;