From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 145C5158128 for ; Mon, 16 Jun 2025 01:18:51 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id F3DC93425A0 for ; Mon, 16 Jun 2025 01:18:50 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 35B2F1104F7; Mon, 16 Jun 2025 01:18:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 25D221104F6 for ; Mon, 16 Jun 2025 01:18:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D69BF34261D for ; Mon, 16 Jun 2025 01:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51B8F29D9 for ; Mon, 16 Jun 2025 01:18:39 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1750036616.ecd4d90a37c8e3480fd627ce812f7d91c78af92e.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/emerge-webrsync X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ecd4d90a37c8e3480fd627ce812f7d91c78af92e X-VCS-Branch: master Date: Mon, 16 Jun 2025 01:18:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ed0bee6e-60de-4437-a0f5-cfa4bebaac56 X-Archives-Hash: 2f54eaa93e8c3140b93d1473e1d54d72 commit: ecd4d90a37c8e3480fd627ce812f7d91c78af92e Author: Kerin Millar plushkava net> AuthorDate: Sun Jun 15 22:10:10 2025 +0000 Commit: Sam James gentoo 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 plushkava.net> Signed-off-by: Sam James 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 ..."