commit:     197799592b34c2c8e31dee25c61f0ca6dc7b2f11
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 05:36:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 07:20:57 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=19779959

emerge-webrsync: don't refresh keys again if Portage-caller

Portage has configuration options for this and its own logic,
it doesn't make sense for us to repeat it (and ignore user configuration).

Bug: https://bugs.gentoo.org/905358
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/emerge-webrsync | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index b59b728c6..4686d7b5f 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -283,6 +283,10 @@ check_file_signature_gemato() {
                        -K "${key}"
                )
 
+               # Portage is calling us so it'll handle refreshing if 
configured to do so.
+               # Don't repeat its work.
+               [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] && gemato_args+=( 
--no-refresh-keys --no-wkd )
+
                [[ ${PORTAGE_QUIET} == 1 ]] && gemato_args+=( --quiet )
                [[ ${do_debug} == 1 ]] && gemato_args+=( --debug )
 

Reply via email to