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=529758a0120af35e6ee1d6cfe6d68012981db936 commit 529758a0120af35e6ee1d6cfe6d68012981db936 Author: Guillem Jover <[email protected]> AuthorDate: Thu Oct 27 20:14:34 2022 +0200 dpkg-buildpackage: Rename $signkey to $signkeyid This makes the variable more clear and gives way to add keyfiles, and work with them all with key handles. Changelog: internal --- scripts/dpkg-buildpackage.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index 99e47c82a..7cef9241e 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -166,7 +166,7 @@ my @source_opts; my $check_command = $ENV{DEB_CHECK_COMMAND}; my @check_opts; my $signpause; -my $signkey = $ENV{DEB_SIGN_KEYID}; +my $signkeyid = $ENV{DEB_SIGN_KEYID}; my $signforce = 0; my $signreleased = 1; my $signsource = 1; @@ -285,7 +285,7 @@ while (@ARGV) { } elsif (/^(?:-p|--sign-command=)(.*)$/) { $signcommand = $1; } elsif (/^(?:-k|--sign-key=)(.*)$/) { - $signkey = $1; + $signkeyid = $1; } elsif (/^--(no-)?check-builddeps$/) { $checkbuilddep = !(defined $1 and $1 eq 'no-'); } elsif (/^-([dD])$/) { @@ -868,9 +868,9 @@ sub update_files_field { } sub signkey_validate { - return unless defined $signkey; + return unless defined $signkeyid; # Make sure this is an hex keyid. - return unless $signkey =~ m/^(?:0x)?([[:xdigit:]]+)$/; + return unless $signkeyid =~ m/^(?:0x)?([[:xdigit:]]+)$/; my $keyid = $1; @@ -900,7 +900,7 @@ sub signfile { close $signfh or syserr(g_('cannot close %s'), $signfile); system($signcommand, '--utf8-strings', '--textmode', '--armor', - '--local-user', $signkey || $maintainer, '--clearsign', + '--local-user', $signkeyid || $maintainer, '--clearsign', '--weak-digest', 'SHA1', '--weak-digest', 'RIPEMD160', '--output', "$signfile.asc", $signfile); my $status = $?; -- Dpkg.Org's dpkg
