diff options
| author |   Sam James <sam@gentoo.org> | 2023-08-19 14:49:19 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-08-19 15:49:33 +0100 |
| commit | f0b44fc1cc67114662b84905bc1e0cd9ce1bba28 (patch) | |
| tree | 2b06852ec3df1fdd5fd9b8bbcb901c4883a95db1 | |
| parent | misc/emerge-delta-webrsync: fix copyright header, whitespace (diff) | |
| download | portage-f0b44fc1.tar.gz portage-f0b44fc1.tar.bz2 portage-f0b44fc1.zip | |
emerge-webrsync: handle https_proxy too
If `https_proxy` is also set in make.conf, pick that up so it's passed down to
wget.
Bug: https://bugs.gentoo.org/691434
Bug: https://bugs.gentoo.org/835927
Bug: https://bugs.gentoo.org/911629
Signed-off-by: Sam James <sam@gentoo.org>
| -rwxr-xr-x | bin/emerge-webrsync | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 7b3163b81..7ef6d0d5a 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -83,8 +83,8 @@ eval "$("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \ PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \ PORTAGE_NICENESS PORTAGE_REPOSITORIES PORTAGE_RSYNC_EXTRA_OPTS \ PORTAGE_RSYNC_OPTS PORTAGE_TEMP_GPG_DIR PORTAGE_TMPDIR \ - USERLAND http_proxy ftp_proxy)" -export http_proxy ftp_proxy + USERLAND http_proxy https_proxy ftp_proxy)" +export http_proxy https_proxy ftp_proxy source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |