commit: aa37e3993866f1d75e855f8c7300749fadd846af Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Aug 19 13:49:53 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 19 14:49:33 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=aa37e399
emerge-webrsync: pass --proxy to gemato if http_proxy or https_proxy is set Make sure we pass proxy settings down into gemato. We include a fallback w/ https_proxy, but note that gnupg doesn't actually use https_proxy but we've had cases reported where users only have https_proxy and not http_proxy set, so include this to help them out too. Bug: https://bugs.gentoo.org/691434 Bug: https://bugs.gentoo.org/835927 Bug: https://bugs.gentoo.org/911629 Signed-off-by: Sam James <sam <AT> gentoo.org> bin/emerge-webrsync | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 7ef6d0d5a9..fea0085682 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -290,6 +290,13 @@ 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 )
