mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-04-19 04:51:24 +07:00
PY-32853 Fix potential NPE in CondaExecutablesLocator
GitOrigin-RevId: 0c10666b2d97610e8ba2e109a86a90f8e1b1e5de
This commit is contained in:
committed by
intellij-monorepo-bot
parent
b56e3b9b47
commit
0bf24e60d0
@@ -68,7 +68,7 @@ fun findCondaExecutableRelativeToEnv(pyExecutable: Path): Path? {
|
||||
return immediateConda
|
||||
}
|
||||
val envsDir = condaFolder.parent ?: return null
|
||||
if (!isBaseConda && envsDir.fileName.toString() == CONDA_ENVS_DIR) {
|
||||
if (!isBaseConda && envsDir.fileName?.toString() == CONDA_ENVS_DIR) {
|
||||
val envsDirParent = envsDir.parent ?: return null
|
||||
return findExecutable(condaName, envsDirParent)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user