Merge pull request #1608 from AlexandreGuinaudeau/patch-1

Support non-conda binaries
rstudio · May 13, 2024 · 7ed6ab0 · 7ed6ab0
2 parents cf6aeda + 691d125
commit 7ed6ab0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -6,6 +6,8 @@
 
 - `virtualenv_starter()` no longer warns when encountering broken symlinks (#1598).
 
+- Fixed issue where a configured `mamba` binary was overriden with `conda` (#1608).
+
 # reticulate 1.36.1
 
 - Fix issue where `py_to_r()` method for Pandas DataFrames would error

diff --git a/R/conda.R b/R/conda.R
@@ -546,7 +546,7 @@ conda_binary <- function(conda = "auto") {
   # we rely on other tools typically bundled in the 'bin' folder
   # https://github.com/rstudio/keras/issues/691
   if (!is_windows()) {
-    altpath <- file.path(dirname(conda), "../bin/conda")
+    altpath <- file.path(dirname(conda), "../bin", basename(conda))
     if (file.exists(altpath))
       return(normalizePath(altpath, winslash = "/", mustWork = TRUE))
   } else {