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 11b7ee0da71a78a2c5331289b7417b03dcefc03e..9a39fedbac96746ad3e9d90ec6d1e1d3cdbf343a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-24  Raphael Hertzog  <hertzog@debian.org>
+
+       * 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  <guillem@debian.org>
 
        * configure.ac: Release 1.14.16.4.

diff --git a/debian/changelog b/debian/changelog
index b84e2dac9ac9455134da6b727ceaab960a887671..0fe0f3cd325fb46b2605374abcd7f67ea1e98886 100644 (file)
--- 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 <hertzog@debian.org>  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 a4c229529a67e924b6d61d7b1ec7d31d3b8b2cba..74c2639d2a7431b1f693a2920be8e485fc6d5fa2 100644 (file)
--- 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 {