From e2bd466208bb12d8986e87f6c9545a5225d94d45 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 26 Mar 2023 14:50:23 +0800 Subject: [PATCH] Correctly list develop packages in conda dev environment --- bootstrap-conda | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bootstrap-conda b/bootstrap-conda index 9ba4b50ab6f..579c3a72f8b 100755 --- a/bootstrap-conda +++ b/bootstrap-conda @@ -11,7 +11,6 @@ STRIP_COMMENTS="sed s/#.*//;" shopt -s extglob DEVELOP_SPKG_PATTERN="@(_develop$(for a in $(head -n 1 build/pkgs/_develop/dependencies); do echo -n "|"$a; done))" - BOOTSTRAP_PACKAGES=$(echo $(${STRIP_COMMENTS} build/pkgs/_bootstrap/distros/conda.txt)) SYSTEM_PACKAGES= OPTIONAL_SYSTEM_PACKAGES= @@ -37,10 +36,13 @@ for PKG_BASE in $(sage-package list --has-file distros/conda.txt); do ;; esac else - case "$PKG_TYPE" in - standard) + case "$PKG_BASE:$PKG_TYPE" in + *:standard) SAGELIB_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES" ;; + $DEVELOP_SPKG_PATTERN:*) + DEVELOP_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES" + ;; *) SAGELIB_OPTIONAL_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES" ;;