[dpkg] 17/28: Dpkg::Shlibs::SymbolFile: Check that $state->{seen} exists instead of $state being defined
Mattia Rizzolo
mattia at debian.org
Mon Jan 22 17:11:24 UTC 2018
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository dpkg.
commit b29058ea75ce28f95b373b0c36deffd4b57d466b
Author: Dmitry Shachnev <mitya57 at debian.org>
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 <guillem at debian.org>
---
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 813b170..820135a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
Reported by Mattia Rizzolo <mattia at debian.org>, on IRC. Closes: #881051
- Dpkg::Changelog: Print versions for incorrect changelog range warnings.
Thanks to Paul Wise <pabs at debian.org>.
+ - Check that $state->{seen} exists instead of $state being just defined.
+ Fixes regression in dpkg-gensymbols symbols output.
+ Thanks to Dmitry Shachnev <mitya57 at debian.org>. Closes: #880166
* Documentation:
- Update gettext minimal version in README.
- Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
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/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list