forked from conda-forge/mamba-feedstock
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport of mamba-org/mamba#3702 Honestly, I've been having alot of trouble with the latest conda version - Conda hanging: conda-forge/conda-feedstock#250 - Can't release conda build 24.11.2 -- conda-forge/miniforge#701 - I think we should just release this small backport in an attempt to help: conda-forge/miniforge#700
- Loading branch information
Showing
2 changed files
with
29 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From 7019dcb30bfdf9929332e73a928aee2b854348ba Mon Sep 17 00:00:00 2001 | ||
From: Mark Harfouche <mark.harfouche@gmail.com> | ||
Date: Thu, 19 Dec 2024 09:28:00 -0500 | ||
Subject: [PATCH] use __conda_activate reactivate instead of __conda_reactivate | ||
|
||
The work in https://github.com/mamba-org/mamba/pull/3643 was deleted | ||
|
||
this is really hurting users at conda-forge (myself included) | ||
https://github.com/conda-forge/miniforge/issues/700#issuecomment-2554272743 | ||
--- | ||
mamba/mamba/shell_templates/mamba.sh | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/mamba/mamba/shell_templates/mamba.sh b/mamba/mamba/shell_templates/mamba.sh | ||
index 6b1c1640a7..a3659358d5 100644 | ||
--- a/mamba/mamba/shell_templates/mamba.sh | ||
+++ b/mamba/mamba/shell_templates/mamba.sh | ||
@@ -17,7 +17,7 @@ mamba() { | ||
;; | ||
install|update|upgrade|remove|uninstall) | ||
__mamba_exe "$@" || \return | ||
- __conda_reactivate | ||
+ __conda_activate reactivate | ||
;; | ||
*) | ||
__mamba_exe "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters