commit:     47abd292da1f2b0bded9f7d4ad21130d18d4a719
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 05:30:13 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=47abd292

emerge-webrsync: respect PORTAGE_GPG_KEY

This will allow us to switch the Portage-caller cases to the
gemato path because we now respect 'sync-openpgp-key-path'.

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

 bin/emerge-webrsync | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 11d6937cd..b59b728c6 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -272,9 +272,15 @@ check_file_signature_gemato() {
        local r=1
 
        if type -P gemato > /dev/null; then
+               if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
+                       local key="${PORTAGE_GPG_KEY}"
+               else
+                       local 
key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+               fi
+
                local gemato_args=(
                        openpgp-verify-detached
-                       -K 
"${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+                       -K "${key}"
                )
 
                [[ ${PORTAGE_QUIET} == 1 ]] && gemato_args+=( --quiet )

Reply via email to