From: Raphael Hertzog Date: Thu, 24 Jan 2008 10:32:54 +0000 (+0100) Subject: Dpkg::Shlibs::SymbolFile: handles multiple #include of the same file X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9263871a0959d09287000f07def97a323cafa23d;p=dpkg Dpkg::Shlibs::SymbolFile: handles multiple #include of the same file * scripts/Dpkg/Shlibs/SymbolFile.pm (load): Remove the loaded file from the %$seen hash at the end so that it's possible to include multiple times the same file (at the same level and not from any nested file obviously). --- diff --git a/ChangeLog b/ChangeLog index 11b7ee0d..9a39fedb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-24 Raphael Hertzog + + * scripts/Dpkg/Shlibs/SymbolFile.pm (load): Remove the loaded file + from the %$seen hash at the end so that it's possible to include + multiple times the same file (at the same level and not from any + nested file obviously). + 2008-01-23 Guillem Jover * configure.ac: Release 1.14.16.4. diff --git a/debian/changelog b/debian/changelog index b84e2dac..0fe0f3cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dpkg (1.14.16.5) UNRELEASED; urgency=low + + * Fix dpkg-gensymbols handling of #include so that one can include multiple + times the same file and have it properly taken into account. + + -- Raphael Hertzog Thu, 24 Jan 2008 11:27:05 +0100 + dpkg (1.14.16.4) unstable; urgency=low * Import capit in Dpkg::Cdata from Dpkg::Fields. Closes: #462172 diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm index a4c22952..74c2639d 100644 --- a/scripts/Dpkg/Shlibs/SymbolFile.pm +++ b/scripts/Dpkg/Shlibs/SymbolFile.pm @@ -158,6 +158,7 @@ sub load { } } close($sym_file); + delete $seen->{$file}; } sub save {