diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index deadbf67dc3..418e4276920 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,4 @@ tarball=configure-VERSION.tar.gz -sha1=7f2fe8137f5998559f8d3a0a7f965adf6d5ebc78 -md5=586738771174a2d26d29ce7ba571a95d -cksum=1156937644 +sha1=8b7ffb6e3984e747b42d30b458220fe60c8ea50a +md5=eee78cc60e5bb6176640574eb28c17cb +cksum=1389896899 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 1596e721179..5c03ad60212 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -2395f7bb45fd7da537a953055df5e0a70dd96c6a +4a970443cd567705f67fcafa7ce1173c45361e3a diff --git a/src/bin/sage-env b/src/bin/sage-env index 29b96c3c895..8fcfda48fb6 100644 --- a/src/bin/sage-env +++ b/src/bin/sage-env @@ -228,7 +228,7 @@ fi # depending on SAGE_ROOT and SAGE_LOCAL which are already defined. if [ -n "$SAGE_LOCAL" ]; then export SAGE_SHARE="$SAGE_LOCAL/share" - export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed" + export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed" # deprecated fi if [ -n "$SAGE_SHARE" ]; then export SAGE_DOC="$SAGE_SHARE/doc/sage" diff --git a/src/sage/env.py b/src/sage/env.py index abf2c3b9401..39d09528788 100644 --- a/src/sage/env.py +++ b/src/sage/env.py @@ -177,7 +177,8 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st SAGE_LOCAL = var("SAGE_LOCAL", SAGE_VENV) SAGE_SHARE = var("SAGE_SHARE", join(SAGE_LOCAL, "share")) SAGE_DOC = var("SAGE_DOC", join(SAGE_SHARE, "doc", "sage")) -SAGE_SPKG_INST = var("SAGE_SPKG_INST", join(SAGE_LOCAL, "var", "lib", "sage", "installed")) +SAGE_LOCAL_SPKG_INST = var("SAGE_LOCAL_SPKG_INST", join(SAGE_LOCAL, "var", "lib", "sage", "installed")) +SAGE_SPKG_INST = var("SAGE_SPKG_INST", join(SAGE_LOCAL, "var", "lib", "sage", "installed")) # deprecated # source tree of the Sage distribution SAGE_ROOT = var("SAGE_ROOT") # no fallback for SAGE_ROOT diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py index dcae7d0c0fc..cbc36ea65b9 100644 --- a/src/sage/misc/package.py +++ b/src/sage/misc/package.py @@ -390,7 +390,7 @@ def _spkg_inst_dirs(): """ Generator for the installation manifest directories as resolved paths. - It yields first ``SAGE_SPKG_INST``, then ``SAGE_VENV_SPKG_INST``, + It yields first ``SAGE_LOCAL_SPKG_INST``, then ``SAGE_VENV_SPKG_INST``, if defined; but it both resolve to the same directory, it only yields one element. @@ -402,7 +402,7 @@ def _spkg_inst_dirs(): """ last_inst_dir = None - for inst_dir in (sage.env.SAGE_SPKG_INST, sage.env.SAGE_VENV_SPKG_INST): + for inst_dir in (sage.env.SAGE_LOCAL_SPKG_INST, sage.env.SAGE_VENV_SPKG_INST): if inst_dir: inst_dir = Path(inst_dir).resolve() if inst_dir.is_dir() and inst_dir != last_inst_dir: