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 46A73158074 for ; Thu, 19 Jun 2025 18:13: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 261AE341F2E for ; Thu, 19 Jun 2025 18:13:51 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BC9B71104DC; Thu, 19 Jun 2025 18:13:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id ABB121104DC for ; Thu, 19 Jun 2025 18:13:47 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D51C341F1B for ; Thu, 19 Jun 2025 18:13:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B148222FD for ; Thu, 19 Jun 2025 18:13:45 +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: <1750356789.62ade1ed23198723ad0837c25af828c25d6310b7.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: 62ade1ed23198723ad0837c25af828c25d6310b7 X-VCS-Branch: master Date: Thu, 19 Jun 2025 18:13:45 +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: 3cbdd3ab-09ae-4af8-b90a-b2a657022f44 X-Archives-Hash: e72a0f191df308a860e8ab61ebd9e3eb commit: 62ade1ed23198723ad0837c25af828c25d6310b7 Author: Kerin Millar plushkava net> AuthorDate: Thu Jun 19 01:29:36 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 19 18:13:09 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=62ade1ed emerge-webrsync: have gpgconf(1) kill gpg-agent, not pgp-agent In order to kill gpg-agent(1), the option-arg given to gpgconf(1) should be "gpg-agent", rather than "pgp-agent". I had spelled it correctly at the time of testing, yet somehow managed to bungle it at the point of queueing the referenced patch. Fixes: c9147587da34ecf6cd19bf1ed2d0835d3d8c1777 Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 81367ec634..c5c16eaf81 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -302,7 +302,7 @@ check_file_signature_gpg() ( # a temporary directory to contain an ephemeral keyring into # which Gentoo's distributed public key block shall be imported. GNUPGHOME=$(mktemp -d -- "${PORTAGE_TMPDIR}/portage/webrsync.XXXXXX") \ - && trap 'gpgconf -K pgp-agent' EXIT \ + && trap 'gpgconf -K gpg-agent' EXIT \ && gpg --batch --import "${key}" \ || exit