Don't change commandLine.exePath in RemoteSdkUtil.
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 6 Feb 2014 20:48:03 +0000 (00:48 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 6 Feb 2014 20:48:03 +0000 (00:48 +0400)
python/src/com/jetbrains/python/console/PydevConsoleRunner.java

index c7b9ceb88d2e7319c4c0ae13d299dc2f73e8bb10..e7952a3c01addb91da5b754a85b4bd0bfb2d68f1 100644 (file)
@@ -134,7 +134,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
 
     final String encoding = defaultCharset != null ? defaultCharset.name() : "utf-8";
     setPythonIOEncoding(setPythonUnbuffered(envs), encoding);
-    
+
     PythonSdkFlavor.initPythonPath(envs, true, PythonCommandLineState.getAddedPaths(sdk));
     return envs;
   }
@@ -296,8 +296,11 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
   private Process createRemoteConsoleProcess(PythonRemoteInterpreterManager manager, String[] command, Map<String, String> env)
     throws ExecutionException {
     RemoteSdkData data = (RemoteSdkData)mySdk.getSdkAdditionalData();
+    assert data != null;
 
     GeneralCommandLine commandLine = new GeneralCommandLine(command);
+
+
     commandLine.getEnvironment().putAll(env);
 
     commandLine.getParametersList().set(1, PythonRemoteInterpreterManager.toSystemDependent(new File(data.getHelpersPath(),
@@ -311,7 +314,6 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
 
     myCommandLine = commandLine.getCommandLineString();
 
-
     RemoteSshProcess remoteProcess =
       manager.createRemoteProcess(getProject(), data, commandLine, true);