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=ae3b466f03f30a71b31403dd1696ccda65e7177b commit ae3b466f03f30a71b31403dd1696ccda65e7177b Author: Guillem Jover <[email protected]> AuthorDate: Mon Mar 11 22:39:38 2019 +0100 Dpkg::Source::Package: Handle Format field being undefined On source format 1.0, the default is for the debian/source/format file not being present, which means we'll start with an empty Format field name. Fixes: commit d1d35a56e401181b6d15baf474a7db21d3372a65 --- debian/changelog | 4 ++++ scripts/Dpkg/Source/Package.pm | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dc7a3e4d6..ea6a844d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ dpkg (1.19.6) UNRELEASED; urgency=medium Using -sA by default means the user might lose data on overwrite if there is already a directory with the same name laying around. Closes: #910737 + - Dpkg::Source::Package: Handle Format field being undefined. On source + format 1.0, the default is for the debian/source/format file not being + present, which means we'll start with an empty Format field name. + Regression introduced in dpkg 1.19.3. * Packaging: - Update usertags. - Install a lintian profile for dpkg based on the debian profile, so that diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm index 69c2a2976..9cc5d178f 100644 --- a/scripts/Dpkg/Source/Package.pm +++ b/scripts/Dpkg/Source/Package.pm @@ -537,7 +537,8 @@ sub extract { } # Store format if non-standard so that next build keeps the same format - if ($self->{fields}{'Format'} ne '1.0' and + if ($self->{fields}{'Format'} and + $self->{fields}{'Format'} ne '1.0' and not $self->{options}{skip_debianization}) { my $srcdir = File::Spec->catdir($newdirectory, 'debian', 'source'); -- Dpkg.Org's dpkg
