commit: 62ade1ed23198723ad0837c25af828c25d6310b7
Author: Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Thu Jun 19 01:29:36 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> 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
