From 22e3067b0fe64844998eefcd89985f2f4a5280f5 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Wed, 25 Apr 2012 20:50:09 +0400 Subject: [PATCH] fixed regression caused by PY-6366 fix (unable to install distribute/pip) --- .../src/com/jetbrains/python/packaging/PyPackageManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/src/com/jetbrains/python/packaging/PyPackageManager.java b/python/src/com/jetbrains/python/packaging/PyPackageManager.java index 02acf4c574c8..38cd937e6139 100644 --- a/python/src/com/jetbrains/python/packaging/PyPackageManager.java +++ b/python/src/com/jetbrains/python/packaging/PyPackageManager.java @@ -257,7 +257,7 @@ public class PyPackageManager { private void installManagement(String name) throws PyExternalProcessException { final File helperFile = PythonHelpersLocator.getHelperFile(name + ".tar.gz"); - String helpersPath = getHelperPath(name); + final String helpersPath = getHelperPath(name); ProcessOutput output = getHelperOutput(PACKAGING_TOOL, Lists.newArrayList(UNTAR, helpersPath), false, helperFile.getParent()); @@ -271,7 +271,7 @@ public class PyPackageManager { } final String fileName = dirName + name + File.separatorChar + "setup.py"; try { - output = getProcessOutput(fileName, Collections.singletonList(INSTALL), true, dirName); + output = getProcessOutput(fileName, Collections.singletonList(INSTALL), true, dirName + name); final int retcode = output.getExitCode(); if (output.isTimeout()) { throw new PyExternalProcessException(ERROR_TIMEOUT, fileName, Lists.newArrayList(INSTALL), "Timed out");