Переглянути джерело

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).
Raphael Hertzog 18 роки тому
батько
коміт
9263871a09
3 змінених файлів з 15 додано та 0 видалено
  1. 7 0
      ChangeLog
  2. 7 0
      debian/changelog
  3. 1 0
      scripts/Dpkg/Shlibs/SymbolFile.pm

+ 7 - 0
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>
 2008-01-23  Guillem Jover  <guillem@debian.org>
 
 
 	* configure.ac: Release 1.14.16.4.
 	* configure.ac: Release 1.14.16.4.

+ 7 - 0
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
 dpkg (1.14.16.4) unstable; urgency=low
 
 
   * Import capit in Dpkg::Cdata from Dpkg::Fields. Closes: #462172
   * Import capit in Dpkg::Cdata from Dpkg::Fields. Closes: #462172

+ 1 - 0
scripts/Dpkg/Shlibs/SymbolFile.pm

@@ -158,6 +158,7 @@ sub load {
 	}
 	}
     }
     }
     close($sym_file);
     close($sym_file);
+    delete $seen->{$file};
 }
 }
 
 
 sub save {
 sub save {