Skip to content

Commit

Permalink
sagemathgh-39226: Unpoison http_proxy for optional pkgs
Browse files Browse the repository at this point in the history
    
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): gmou3, Kwankyu Lee
  • Loading branch information
Release Manager committed Jan 19, 2025
2 parents e0a7418 + e887ab3 commit 35b4eab
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
16 changes: 8 additions & 8 deletions build/bin/sage-spkg
Original file line number Diff line number Diff line change
Expand Up @@ -603,14 +603,14 @@ case "$PKG_SRC" in
esac
# Poison the proxy variable to forbid downloads in spkg-install
# for normal packages
case $PKG_SRC_TYPE in
normal|wheel)
export http_proxy=http://192.0.2.0:5187/
export https_proxy=$http_proxy
export ftp_proxy=$http_proxy
export rsync_proxy=$http_proxy
;;
# for normal/wheel standard packages
case "$PKG_TYPE:$PKG_SRC_TYPE" in
standard:normal|standard:wheel)
export http_proxy=http://192.0.2.0:5187/
export https_proxy=$http_proxy
export ftp_proxy=$http_proxy
export rsync_proxy=$http_proxy
;;
esac
# Make sage-logger show the full logs
Expand Down
1 change: 0 additions & 1 deletion build/pkgs/ccache/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ mkdir build
cd build
sdh_cmake -DCMAKE_BUILD_TYPE=Release \
-DENABLE_TESTING=OFF \
-DREDIS_STORAGE_BACKEND=OFF \
..
sdh_make
sdh_make_install
Expand Down

0 comments on commit 35b4eab

Please sign in to comment.