Let dpkg-gencontrol bail out with an error if parsedep

found an error while parsing a dependency field. Closes: #228125

diff --git a/ChangeLog b/ChangeLog
index 73c0c9e7e8113455fe7485f0a0d8464bae1fe0de..9099da28d2dd4037a3565b71ccd0b255b7de80dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-27  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/dpkg-gencontrol: Bail out with an error if parsedep
+       found an error while parsing a dependency field.
+
 2005-08-17  Scott James Remnant  <scott@netsplit.com>
 
        * configure.ac: Bump version to 1.13.12~.

diff --git a/debian/changelog b/debian/changelog
index 7b122ae3329d0d5587b1f187d1d812ae729891cb..e42910e42d3b74d0844b3af77e10bd7ff223abcc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dpkg (1.13.12~) unstable; urgency=low
+
+  [Frank Lichtenheld]
+  * Let dpkg-gencontrol bail out with an error if parsedep
+    found an error while parsing a dependency field. Closes: #228125
+
+ --
+
 dpkg (1.13.11.1) unstable; urgency=low
 
   * Change maintainers to new team.

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 97c4b03668ef4e66cc2e704476afeb12f603f82f..e3debe49313258182daafd196d8e1d183e72b8f4 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -182,7 +182,9 @@ for $_ (keys %fi) {
     } elsif (s/^C$myindex //) {
         if (m/^(Package|Description|Essential|Optional)$/) {
         } elsif (exists($pkg_dep_fields{$_})) {
-            $f{$_}= showdep(parsedep(substvars($v)), 0);
+           my $dep = parsedep(substvars($v));
+           &error("error occoured while parsing $_") unless defined $dep;
+            $f{$_}= showdep($dep, 0);
         } elsif (m/^Section$|^Priority$/) {
         } elsif (m/^Architecture$/) {
         } elsif (s/^X[CS]*B[CS]*-//i) {