commit:     ecd4d90a37c8e3480fd627ce812f7d91c78af92e
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sun Jun 15 22:10:10 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 16 01:16:56 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ecd4d90a

emerge-webrsync: move the gnupg_status and line vars to 
check_file_signature_gpg_unwrapped()

Presently, the 'gnupg_status' and 'line' variables are declared as local
to the check_file_signature() function, yet they have no business being
there. Instead, declare them in check_file_signature_gpg_unwrapped().

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 62a6a76ea7..15c234474b 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -291,7 +291,7 @@ check_file_signature_gemato() {
 
 check_file_signature_gpg_unwrapped() {
        local signature=$1 file=$2
-       local gpgdir key
+       local gnupg_status gpgdir line key
 
        if type -P gpg > /dev/null; then
                if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
@@ -340,7 +340,7 @@ check_file_signature_gpg_unwrapped() {
 
 check_file_signature() {
        local signature=$1 file=$2
-       local gnupg_status line r=1
+       local r=1
 
        if [[ ${WEBRSYNC_VERIFY_SIGNATURE} != 0 ]]; then
                [[ ${PORTAGE_QUIET} -eq 1 ]] || einfo "Checking signature ..."

Reply via email to