From: Raphael Hertzog <hertzog@debian.org>
Date: Mon, 19 Nov 2007 21:26:05 +0000 (+0100)
Subject: dpkg-gencontrol.pl: Don't try to parse empty fields.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbad623b0dbff674019e630286d46ed62c8ddb32;p=dpkg

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

diff --git a/ChangeLog b/ChangeLog
index 1acb0919..3620978f 100644
--- 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 c07bcd45..fd36dc4c 100644
--- 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 7d80264e..f34660b9 100755
--- 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,