diff options
| author |   Sam James <sam@gentoo.org> | 2023-08-19 16:02:17 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-08-19 16:02:17 +0100 |
| commit | 058af64372fc6937cb83e58653133f2dba47d410 (patch) | |
| tree | b36fef02646146500a25f42ad2848c0b7b44bfad | |
| parent | make.conf.5: mention https_proxy (diff) | |
| download | portage-058af643.tar.gz portage-058af643.tar.bz2 portage-058af643.zip | |
misc/emerge-delta-webrsync: sync with emerge-webrsync for proxy support
Signed-off-by: Sam James <sam@gentoo.org>
| -rwxr-xr-x | misc/emerge-delta-webrsync | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync index b2925f013..1a54d4173 100755 --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@ -94,8 +94,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 @@ -401,6 +401,12 @@ check_file_signature_gemato() { -K "${key}" ) + if [[ -n ${http_proxy} || -n ${https_proxy} ]] ; then + gemato_args+=( + --proxy "${http_proxy:-${https_proxy}}" + ) + fi + [[ -n ${PORTAGE_GPG_KEY_SERVER} ]] && gemato_args+=( --keyserver "${PORTAGE_GPG_KEY_SERVER}" ) [[ ${PORTAGE_QUIET} == 1 ]] && gemato_args+=( --quiet ) [[ ${do_debug} == 1 ]] && gemato_args+=( --debug ) |