[debian-dpkg-cvs] COMMAND DISCARD 11375838309974

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[debian-dpkg-cvs] COMMAND DISCARD 11375838309974

Mailing List Manager-2
Subject: Moderator Instructions

MODERATOR: The following message was posted to "debian-dpkg-cvs"
           and is awaiting your approval.
           
     o To DISCARD  Reply to this email.  That's it!
     o To APPROVE  Change COMMAND in the Subject to APPROVE

       Examples:
                COMMAND APPROVE 11375838309974
                           - or -
                COMMAND DISCARD 11375838309974

     <Extra stuff before "COMMAND" in the Subject will be ignored.>

- - - - - - -
OTHER COMMANDS
- - - - - - -
 o COMMENT:  *WARNING*  The post will be approved, and your message
             text is added as a Moderator's comment on the post.

 o REJECT:   *WARNING*  The post will be discarded, and your message
             text is added as a Moderator's explaination for the
             rejection.  This email is then forwarded to the sender.

 o SUB:      Discards the post, and processes a correct "subscribe"
             request on behalf of the user.

 o UNSUB:    Discards the post, and processes a correct "unsubscribe"
             request on behalf of the user.


>From [hidden email]  Wed Jan 18 05:14:01 2006
Return-Path: <[hidden email]>
X-Original-To: [hidden email]
Received: from costa.debian.org (costa.debian.org [217.196.43.131]) by murphy.debian.org (Postfix) with ESMTP id 5C92A2ECA1 for <[hidden email]>; Wed, 18 Jan 2006 05:14:01 -0600 (CST)
Received: from djpig by costa.debian.org with local (Exim 4.50) id 1EzBGK-0004NS-Lr for [hidden email]; Wed, 18 Jan 2006 11:14:00 +0000
To: [hidden email]
Subject: r3 - in trunk: . debian scripts
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Frank Lichtenheld <[hidden email]>
Message-Id: <[hidden email]>
Date: Wed, 18 Jan 2006 11:14:00 +0000
X-SA-Exim-Connect-IP: <locally generated>
X-Rc-Spam: 2005-09-11_01
X-Rc-Virus: 2005-11-10_01
X-Rc-Spam: 2005-09-11_01
X-Spam-Checker-Version: SpamAssassin 3.0.3 (2005-04-27) on murphy.debian.org
X-Spam-Level:
X-Spam-Status: No, score=0.0 required=4.0 tests=none autolearn=no  version=3.0.3

Author: djpig
Date: 2006-01-18 11:13:58 +0000 (Wed, 18 Jan 2006)
New Revision: 3

Modified:
   trunk/ChangeLog
   trunk/debian/changelog
   trunk/scripts/dpkg-gencontrol.pl
Log:
Let dpkg-gencontrol bail out with an error if parsedep
found an error while parsing a dependency field. Closes: #228125


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-01-18 09:51:22 UTC (rev 2)
+++ trunk/ChangeLog 2006-01-18 11:13:58 UTC (rev 3)
@@ -1,3 +1,8 @@
+2005-08-27  Frank Lichtenheld  <[hidden email]>
+
+       * scripts/dpkg-gencontrol: Bail out with an error if parsedep
+       found an error while parsing a dependency field.
+
 2005-08-17  Scott James Remnant  <[hidden email]>
 
  * configure.ac: Bump version to 1.13.12~.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-18 09:51:22 UTC (rev 2)
+++ trunk/debian/changelog 2006-01-18 11:13:58 UTC (rev 3)
@@ -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.

Modified: trunk/scripts/dpkg-gencontrol.pl
===================================================================
--- trunk/scripts/dpkg-gencontrol.pl 2006-01-18 09:51:22 UTC (rev 2)
+++ trunk/scripts/dpkg-gencontrol.pl 2006-01-18 11:13:58 UTC (rev 3)
@@ -182,7 +182,9 @@
     } 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) {