Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpoison http_proxy for optional pkgs #39226

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading