fixed regression caused by PY-6366 fix (unable to install distribute/pip)

This commit is contained in:
Ekaterina Tuzova
2012-04-25 20:50:09 +04:00
parent c0819d326c
commit 22e3067b0f
@@ -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.<String>singletonList(INSTALL), true, dirName);
output = getProcessOutput(fileName, Collections.<String>singletonList(INSTALL), true, dirName + name);
final int retcode = output.getExitCode();
if (output.isTimeout()) {
throw new PyExternalProcessException(ERROR_TIMEOUT, fileName, Lists.newArrayList(INSTALL), "Timed out");