This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=37973f01415213b477a936f5a813604567650764 commit 37973f01415213b477a936f5a813604567650764 Author: Guillem Jover <[email protected]> AuthorDate: Wed Jul 20 02:46:07 2022 +0200 Dpkg::OpenPGP: Rename keyrings option to certs These are signer certificates, it does not necessarily contain (private) keys. --- scripts/Dpkg/OpenPGP.pm | 4 ++-- scripts/Dpkg/Source/Package.pm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm index 93fa2d6b0..41b816db2 100644 --- a/scripts/Dpkg/OpenPGP.pm +++ b/scripts/Dpkg/OpenPGP.pm @@ -169,8 +169,8 @@ sub _gpg_verify { my @exec = qw(gpgv); push @exec, _gpg_options_weak_digests(); push @exec, '--homedir', $gpghome; - foreach my $keyring (@certs) { - push @exec, '--keyring', $keyring; + foreach my $cert (@certs) { + push @exec, '--keyring', $cert; } push @exec, $sig if defined $sig; push @exec, $data; diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm index e2540f8dd..e0208c507 100644 --- a/scripts/Dpkg/Source/Package.pm +++ b/scripts/Dpkg/Source/Package.pm @@ -477,21 +477,21 @@ then any problem will result in a fatal error. sub check_signature { my $self = shift; my $dsc = $self->get_filename(); - my @keyrings; + my @certs; if (length $ENV{HOME} and -r "$ENV{HOME}/.gnupg/trustedkeys.gpg") { - push @keyrings, "$ENV{HOME}/.gnupg/trustedkeys.gpg"; + push @certs, "$ENV{HOME}/.gnupg/trustedkeys.gpg"; } foreach my $vendor_keyring (run_vendor_hook('package-keyrings')) { if (-r $vendor_keyring) { - push @keyrings, $vendor_keyring; + push @certs, $vendor_keyring; } } my $opts = { require_valid_signature => $self->{options}{require_valid_signature}, }; - Dpkg::OpenPGP::inline_verify($opts, $dsc, @keyrings); + Dpkg::OpenPGP::inline_verify($opts, $dsc, @certs); } sub describe_cmdline_options { -- Dpkg.Org's dpkg
