Skip to content

Commit 7ff1b37

Browse files
author
Release Manager
committed
sagemathgh-39226: Unpoison `http_proxy` for optional pkgs This allows optional packages to download dependencies during installation. For details on the reasoning behind this change see [passagemath/issues/ 613](passagemath/passagemath#613). Post on `sage-devel`: https://groups.google.com/g/Sage- Devel/c/ZZIvoEHm5hg. URL: sagemath#39226 Reported by: gmou3 Reviewer(s): Dima Pasechnik, gmou3, Kwankyu Lee
2 parents a4b8e6d + e887ab3 commit 7ff1b37

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

build/bin/sage-spkg

+8-8
Original file line numberDiff line numberDiff line change
@@ -603,14 +603,14 @@ case "$PKG_SRC" in
603603
esac
604604
605605
# Poison the proxy variable to forbid downloads in spkg-install
606-
# for normal packages
607-
case $PKG_SRC_TYPE in
608-
normal|wheel)
609-
export http_proxy=http://192.0.2.0:5187/
610-
export https_proxy=$http_proxy
611-
export ftp_proxy=$http_proxy
612-
export rsync_proxy=$http_proxy
613-
;;
606+
# for normal/wheel standard packages
607+
case "$PKG_TYPE:$PKG_SRC_TYPE" in
608+
standard:normal|standard:wheel)
609+
export http_proxy=http://192.0.2.0:5187/
610+
export https_proxy=$http_proxy
611+
export ftp_proxy=$http_proxy
612+
export rsync_proxy=$http_proxy
613+
;;
614614
esac
615615
616616
# Make sage-logger show the full logs

build/pkgs/ccache/spkg-install.in

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ mkdir build
44
cd build
55
sdh_cmake -DCMAKE_BUILD_TYPE=Release \
66
-DENABLE_TESTING=OFF \
7-
-DREDIS_STORAGE_BACKEND=OFF \
87
..
98
sdh_make
109
sdh_make_install

0 commit comments

Comments
 (0)