瀏覽代碼

Dpkg::Changelog::Debian: call $entry->check_trailer() for trailer line

The header line was checked twice, the second check was meant to
check the trailer line. So change it accordingly.
Raphaël Hertzog 17 年之前
父節點
當前提交
e89348732c
共有 2 個文件被更改,包括 2 次插入 和 1 次删除
  1. 1 0
      debian/changelog
  2. 1 1
      scripts/Dpkg/Changelog/Debian.pm

+ 1 - 0
debian/changelog

@@ -13,6 +13,7 @@ dpkg (1.15.5.4) UNRELEASED; urgency=low
     workflow is VCS based and can't generate a full patch set.
     workflow is VCS based and can't generate a full patch set.
   * dpkg-source now uses debian/source/patch-header as header of the automatic
   * dpkg-source now uses debian/source/patch-header as header of the automatic
     Debian patch in format "3.0 (quilt)".
     Debian patch in format "3.0 (quilt)".
+  * Fix Debian changelog parser so that the trailer line is again checked.
 
 
  -- Raphael Hertzog <hertzog@debian.org>  Sun, 29 Nov 2009 18:15:16 +0100
  -- Raphael Hertzog <hertzog@debian.org>  Sun, 29 Nov 2009 18:15:16 +0100
 
 

+ 1 - 1
scripts/Dpkg/Changelog/Debian.pm

@@ -128,7 +128,7 @@ sub parse {
 	    $entry->set_part("trailer", $_);
 	    $entry->set_part("trailer", $_);
 	    $entry->extend_part("blank_after_changes", [ @blanklines ]);
 	    $entry->extend_part("blank_after_changes", [ @blanklines ]);
 	    @blanklines = ();
 	    @blanklines = ();
-	    foreach my $error ($entry->check_header()) {
+	    foreach my $error ($entry->check_trailer()) {
 		$self->parse_error($file, $., $error, $_);
 		$self->parse_error($file, $., $error, $_);
 	    }
 	    }
 	    $expect = NEXT_OR_EOF;
 	    $expect = NEXT_OR_EOF;