This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch sid in repository dpkg.
commit e7ad5635c104399ea1bbeaa0ef2902be3791ffcd Author: Dmitry Shachnev <[email protected]> Date: Sun Dec 3 03:37:23 2017 +0100 Dpkg::Shlibs::SymbolFile: Check that $state->{seen} exists instead of $state being defined Fixes: commit 0d2b3cee25b74dd3fd9ddc3a469b8b144368c963 Closes: #880166 Signed-off-by: Guillem Jover <[email protected]> (cherry picked from commit b29058ea75ce28f95b373b0c36deffd4b57d466b) --- debian/changelog | 3 +++ scripts/Dpkg/Shlibs/SymbolFile.pm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6fb0124..ee9b7bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ dpkg (1.19.0.5) UNRELEASED; urgency=medium - Dpkg::Vendor::Debian: Use proper %use_feature key. This was causing perl errors on paths not accapted for fixdebugpath. Reported by Mattia Rizzolo <[email protected]>, on IRC. Closes: #881051 + - Check that $state->{seen} exists instead of $state being just defined. + Fixes regression in dpkg-gensymbols symbols output. + Thanks to Dmitry Shachnev <[email protected]>. Closes: #880166 -- Guillem Jover <[email protected]> Wed, 17 Jan 2018 03:16:09 +0100 diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm index d03ce25..b36d542 100644 --- a/scripts/Dpkg/Shlibs/SymbolFile.pm +++ b/scripts/Dpkg/Shlibs/SymbolFile.pm @@ -204,7 +204,7 @@ sub parse { my ($self, $fh, $file, %opts) = @_; my $state = $opts{state} //= {}; - if (defined $state) { + if (exists $state->{seen}) { return if exists $state->{seen}{$file}; # Avoid include loops } else { $self->{file} = $file; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
