MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 22:11:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Iterate only once through CONDA_DEFAULT_ROOTS in PyCondaPackageService.getCondaExecutableByName

Browse Source 
GitOrigin-RevId: 4356444240b4cdc81365135612167e9af8d80dd9
This commit is contained in:
Semyon Proshev
2021-12-10 14:19:42 +03:00
committed by intellij-monorepo-bot
parent 90e1a8533e
commit 294e10debe
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
python/python-sdk/src/com/jetbrains/python/packaging/PyCondaPackageService.java
View File

@@ -166,31 +166,29 @@ public class PyCondaPackageService implements PersistentStateComponent<PyCondaPa
@Nullable
private static String getCondaExecutableByName(@NotNull final String condaName) {
final VirtualFile userHome = LocalFileSystem.getInstance().findFileByPath(SystemProperties.getUserHome().replace('\\', '/'));
if (userHome != null) {
for (String root : CONDA_DEFAULT_ROOTS) {
VirtualFile condaFolder = userHome.findChild(root);
String executableFile = findExecutable(condaName, condaFolder);
for (String root : CONDA_DEFAULT_ROOTS) {
VirtualFile condaFolder = userHome == null ? null : userHome.findChild(root);
String executableFile = findExecutable(condaName, condaFolder);
if (executableFile != null) return executableFile;
//noinspection IfStatementWithIdenticalBranches
if (SystemInfo.isWindows) {
condaFolder = userHome == null ? null : userHome.findFileByRelativePath("AppData\\Local\\Continuum\\" + root);
executableFile = findExecutable(condaName, condaFolder);
if (executableFile != null) return executableFile;
if (SystemInfo.isWindows) {
final VirtualFile appData = userHome.findFileByRelativePath("AppData\\Local\\Continuum\\" + root);
executableFile = findExecutable(condaName, appData);
if (executableFile != null) return executableFile;
condaFolder = LocalFileSystem.getInstance().findFileByPath("C:\\ProgramData\\" + root);
executableFile = findExecutable(condaName, condaFolder);
if (executableFile != null) return executableFile;
condaFolder = LocalFileSystem.getInstance().findFileByPath("C:\\ProgramData\\" + root);
executableFile = findExecutable(condaName, condaFolder);
if (executableFile != null) return executableFile;
condaFolder = LocalFileSystem.getInstance().findFileByPath("C:\\" + root);
executableFile = findExecutable(condaName, condaFolder);
if (executableFile != null) return executableFile;
}
condaFolder = LocalFileSystem.getInstance().findFileByPath("C:\\" + root);
executableFile = findExecutable(condaName, condaFolder);
if (executableFile != null) return executableFile;
}
}
if (!SystemInfo.isWindows) {
for (String root : CONDA_DEFAULT_ROOTS) {
final VirtualFile systemCondaFolder = LocalFileSystem.getInstance().findFileByPath("/opt/" + root);
final String executableFile = findExecutable(condaName, systemCondaFolder);
else {
condaFolder = LocalFileSystem.getInstance().findFileByPath("/opt/" + root);
executableFile = findExecutable(condaName, condaFolder);
if (executableFile != null) return executableFile;
}
}