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

Remove duplication

Browse Source
This commit is contained in:
Dmitry Trofimov
2018-11-09 00:15:21 +01:00
parent a1b3067c90
commit 6f00c0e0ae
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java
+6 -7
View File
@@ -91,13 +91,17 @@ public class PyCondaPackageManagerImpl extends PyPackageManagerImpl {
final GeneralCommandLine commandLine = new GeneralCommandLine(parameters);
final CapturingProcessHandler handler = new CapturingProcessHandler(commandLine);
final ProcessOutput result = handler.runProcess();
checkExitCode(parameters, result);
return result;
}
private static void checkExitCode(ArrayList<String> parameters, ProcessOutput result) throws PyExecutionException {
final int exitCode = result.getExitCode();
if (exitCode != 0) {
final String message = StringUtil.isEmptyOrSpaces(result.getStdout()) && StringUtil.isEmptyOrSpaces(result.getStderr()) ?
"Permission denied" : "Non-zero exit code";
throw new PyExecutionException(message, "Conda", parameters, result);
}
return result;
}
@Nullable
@@ -232,12 +236,7 @@ public class PyCondaPackageManagerImpl extends PyPackageManagerImpl {
if (result.isCancelled()) {
throw new RunCanceledByUserException();
}
final int exitCode = result.getExitCode();
if (exitCode != 0) {
final String message = StringUtil.isEmptyOrSpaces(result.getStdout()) && StringUtil.isEmptyOrSpaces(result.getStderr()) ?
"Permission denied" : "Non-zero exit code";
throw new PyExecutionException(message, "Conda", parameters, result);
}
checkExitCode(parameters, result);
final String binary = PythonSdkType.getPythonExecutable(destinationDir);
final String binaryFallback = destinationDir + File.separator + "bin" + File.separator + "python";
return (binary != null) ? binary : binaryFallback;