From 029448539064d072b2f3f2f29558c79eaa40c3d0 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Mon, 5 Oct 2015 18:21:50 +0300
Subject: [PATCH] fixed PY-17106       There are exceptions about exePath if
 conda interpreter was installed not in default location

---
 .../python/packaging/PyCondaPackageManagerImpl.java          | 1 +
 .../jetbrains/python/packaging/PyCondaPackageService.java    | 5 ++++-
 .../jetbrains/python/packaging/PyPackageManagersImpl.java    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

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<String> arguments) throws ExecutionException {
     final String condaExecutable = PyCondaPackageService.getCondaExecutable();
+    if (condaExecutable == null) throw new PyExecutionException("Cannot find conda", "Conda", Collections.<String>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<PyCondaPa
   @Nullable
   public static String getCondaExecutable() {
     final String condaName = SystemInfo.isWindows ? "conda.exe" : "conda";
+    final File condaInPath = PathEnvironmentVariableUtil.findInPath(condaName);
+    if (condaInPath != null) return condaInPath.getPath();
     return getCondaExecutable(condaName);
   }
 
@@ -127,7 +130,7 @@ public class PyCondaPackageService implements PersistentStateComponent<PyCondaPa
   }
 
   @Nullable
-  private static String findExecutable(String condaName, VirtualFile condaFolder) {
+  private static String findExecutable(String condaName, @Nullable final VirtualFile condaFolder) {
     if (condaFolder != null) {
       final VirtualFile bin = condaFolder.findChild(SystemInfo.isWindows ? "Scripts" : "bin");
       if (bin != null) {
diff --git a/python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java b/python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java
index 8e7a46761952..f81befa5886a 100644
--- a/python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java
+++ b/python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java
@@ -39,7 +39,7 @@ public class PyPackageManagersImpl extends PyPackageManagers {
       if (PythonSdkType.isRemote(sdk)) {
         manager = new PyRemotePackageManagerImpl(sdk);
       }
-      else if (PyCondaPackageManagerImpl.isCondaVEnv(sdk)) {
+      else if (PyCondaPackageManagerImpl.isCondaVEnv(sdk) && PyCondaPackageService.getCondaExecutable() != null) {
         manager = new PyCondaPackageManagerImpl(sdk);
       }
       else {