Skip to content

Commit

Permalink
Use __conda_activate reactivate
Browse files Browse the repository at this point in the history
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
hmaarrfk committed Dec 29, 2024
1 parent 6a04945 commit 67ffb0c
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
26 changes: 26 additions & 0 deletions recipe/3702_use_conda_activate_reactivate.patch
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 "$@"
4 changes: 3 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ package:
source:
url: https://github.com/mamba-org/mamba/archive/refs/tags/{{ release }}.tar.gz
sha256: 0791f5eac09611983bdd7c63dbfa046f7fb464525fa6c7967c40805093199d91
patches:
- 3702_use_conda_activate_reactivate.patch

build:
number: 0
number: 1

outputs:
- name: libmamba
Expand Down

0 comments on commit 67ffb0c

Please # to comment.