[gentoo-commits] proj/portage:master commit in: lib/portage/sync/

["Sam James" <sam@gentoo.org>]

commit:     eb3a3878e36e32ed0f8385b7ff8e978fbbe1aff3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 13:51:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 14:49:34 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=eb3a3878

sync: handle https_proxy too

Pass down https_proxy into gemato.

If http_proxy isn't set, but https_proxy is, then let's fall back to it to help
users out. gnupg itself doesn't use https_proxy but users may have only https_proxy
set rather than http_proxy and https_proxy.

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>

 lib/portage/sync/syncbase.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py
index b7228a38a6..9c25a0299b 100644
--- a/lib/portage/sync/syncbase.py
+++ b/lib/portage/sync/syncbase.py
@@ -333,6 +333,8 @@ class SyncBase:
             # Override global proxy setting with one provided in emerge configuration
             if "http_proxy" in self.spawn_kwargs["env"]:
                 proxy = self.spawn_kwargs["env"]["http_proxy"]
+            elif "https_proxy" in self.spawn_kwargs["env"]:
+                proxy = self.spawn_kwargs["env"]["https_proxy"]
             else:
                 proxy = None