dpkg-gencontrol.pl: Don't try to parse empty fields.

diff --git a/ChangeLog b/ChangeLog
index 1acb09197c5d884f733a416d9424708bdb2c89d0..3620978f910e17d3af5d00d1dc33c1f8f56f0a35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        problem (when a RPATH contains $ORIGIN and when the value of
        this variable can't be determined because we don't know what
        is the root directory of the temporary tree).
+       * scripts/dpkg-gencontrol.pl: Don't try to parse empty fields.
 
 2007-11-19  Guillem Jover  <guillem@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index c07bcd45aa250a50e4cd72988f0d27de21168e79..fd36dc4c6b27b5fc12f9988836201485ba3a6de8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dpkg (1.14.9) UNRELEASED; urgency=low
   [ Raphael Hertzog ]
   * Fix bad behaviour of Dpkg::Path::get_pkg_root_dir() and adjust
     dpkg-shlibdeps accordingly.
+  * Fix dpkg-gencontrol to not try to parse and simplify empty fields.
 
   [ Updated man pages translations ]
     * German (Helge Kreutzmann).

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 7d80264e2225f06bd7941c42766553bbd4efaafa..f34660b91ccf82dfbdd88cafcd7686550d03ccf3 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -249,7 +249,7 @@ if (exists $fi{"C$myindex Provides"}) {
 my (@seen_deps);
 foreach my $field (@pkg_dep_fields) {
     my $key = "C$myindex $field";
-    if (exists $fi{$key}) {
+    if (exists $fi{$key} and $fi{$key}) {
        my $dep;
        if ($dep_field_type{$field} eq 'normal') {
            $dep = Dpkg::Deps::parse(substvars($fi{$key}), use_arch => 1,