This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=f032555d9f98f00b0ccf05d6459a6bb8f9897f0b commit f032555d9f98f00b0ccf05d6459a6bb8f9897f0b Author: Guillem Jover <[email protected]> AuthorDate: Tue Jan 28 23:24:30 2020 +0100 Dpkg::Source::Package: Fix original tarball signature calls We need to pass the directory as the first argument, and should not be calling the functions if there are no tarball signatures to verify. Fixes: commit 3821f024d92aabf24a333025c1c1956d8a45e718 Reported-by: Niels Thykier <[email protected]> --- scripts/Dpkg/Source/Package/V1.pm | 2 +- scripts/Dpkg/Source/Package/V2.pm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm index d91cea03b..636a92452 100644 --- a/scripts/Dpkg/Source/Package/V1.pm +++ b/scripts/Dpkg/Source/Package/V1.pm @@ -419,7 +419,7 @@ sub do_build { info(g_('building %s using existing %s'), $sourcepackage, $tarsign); $self->add_file($tarsign); - $self->check_original_tarball_signature($tarsign); + $self->check_original_tarball_signature($dir, $tarsign); } if ($sourcestyle =~ m/[kpKP]/) { diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index d84fce2dd..b6d7bf6dc 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -438,7 +438,9 @@ sub _generate_patch { $self->{fields}{'Source'}, $origtarfile); } - $self->check_original_tarball_signature(@origtarsigns); + if (@origtarsigns) { + $self->check_original_tarball_signature($dir, @origtarsigns); + } } # Unpack a second copy for comparison -- Dpkg.Org's dpkg
