try to un-hardcode bin/conda

that is to allow for mamba
galaxyproject · Sep 3, 2024 · 3590a4b · 3590a4b
1 parent 2e05fca
commit 3590a4b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/galaxy/tool_util/deps/conda_util.py b/lib/galaxy/tool_util/deps/conda_util.py
@@ -219,7 +219,8 @@ def can_install_conda(self) -> bool:
         does not exist or is empty.
         """
         conda_exec = os.path.abspath(self.conda_exec)
-        conda_prefix_plus_exec = os.path.abspath(os.path.join(self.conda_prefix, "bin/conda"))
+        conda_exec_basename = os.path.basename(self.conda_exec)
+        conda_prefix_plus_exec = os.path.abspath(os.path.join(self.conda_prefix, "bin", conda_exec_basename))
         if conda_exec == conda_prefix_plus_exec:
             if not os.path.exists(self.conda_prefix):
                 return True