The following commit has been merged in the lenny branch:
commit 2726f44f7a07576f10cfadc94158f672f9a51b14
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date:   Thu May 8 17:40:33 2008 +0200

    Dpkg::Changelog::Debian: bugfix in changelog parser
    
    * scripts/Dpkg/Changelog/Debian.pm (parse): Bugfix in creation of
    an unexpected new changelog entry that lacks an heading line.
    Closes: #478925

diff --git a/ChangeLog b/ChangeLog
index cb94717..961e4df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-08  Raphael Hertzog  <[EMAIL PROTECTED]>
+
+       * scripts/Dpkg/Changelog/Debian.pm (parse): Bugfix in creation of
+       an unexpected new changelog entry that lacks an header line.
+
 2008-05-04  Marco d'Itri  <[EMAIL PROTECTED]>
 
        * scripts/Dpkg/Source/Patch.pm: Add missing import of internerr.
diff --git a/debian/changelog b/debian/changelog
index 4d863d2..6c52593 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ dpkg (1.14.19) UNRELEASED; urgency=low
     For example "1.0" and "1.1" would both map to Dpkg::Source::Package::V1
     instead of ::V1_0 and ::V1_1 before. Similarly "3.0 (quilt)" now maps to
     ::V3::quilt instead of ::V3_0::quilt.
+  * Fix changelog parser to not fail when an unexpected changelog entry
+    appears without the preceding heading line. Closes: #478925
   
   [ Helge Kreutzmann ]
   * Minor fixes and clarifications to man pages.
diff --git a/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm
index b9a4b03..d1ec41e 100644
--- a/scripts/Dpkg/Changelog/Debian.pm
+++ b/scripts/Dpkg/Changelog/Debian.pm
@@ -256,7 +256,7 @@ sub parse {
                        $entry->{'Closes'} = find_closes( $entry->{Changes} );
 #                  print STDERR, Dumper($entry);
                        push @{$self->{data}}, $entry;
-                       $entry = Dpkg::Changelog::Entry->init();
+                       $entry = new Dpkg::Changelog::Entry;
                        $entry->{Source} =
                            $entry->{Distribution} = $entry->{Urgency} =
                            $entry->{Urgency_LC} = 'unknown';

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to