diff --git a/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java index f597917178f2..d46dce3f0b5a 100644 --- a/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java +++ b/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java @@ -75,6 +75,7 @@ public class PyCondaPackageManagerImpl extends PyPackageManagerImpl { private ProcessOutput getCondaOutput(@NotNull final String command, List arguments) throws ExecutionException { final String condaExecutable = PyCondaPackageService.getCondaExecutable(); + if (condaExecutable == null) throw new PyExecutionException("Cannot find conda", "Conda", Collections.emptyList(), new ProcessOutput()); final String path = getCondaDirectory(); if (path == null) throw new PyExecutionException("Empty conda name for " + mySdk, command, arguments); diff --git a/python/src/com/jetbrains/python/packaging/PyCondaPackageService.java b/python/src/com/jetbrains/python/packaging/PyCondaPackageService.java index c3355fa4c0d0..ac8289e01041 100644 --- a/python/src/com/jetbrains/python/packaging/PyCondaPackageService.java +++ b/python/src/com/jetbrains/python/packaging/PyCondaPackageService.java @@ -15,6 +15,7 @@ */ package com.jetbrains.python.packaging; +import com.intellij.execution.configurations.PathEnvironmentVariableUtil; import com.intellij.execution.process.ProcessOutput; import com.intellij.openapi.components.*; import com.intellij.openapi.util.SystemInfo; @@ -98,6 +99,8 @@ public class PyCondaPackageService implements PersistentStateComponent