From 7f752eaecf07b776978f11eee8602d908782d8d9 Mon Sep 17 00:00:00 2001 From: Raphael Hertzog Date: Thu, 5 Jun 2008 18:47:03 +0200 Subject: [PATCH] dpkg-source/3.0 (quilt): bugfix in parser of series file * scripts/Dpkg/Source/Package/V3/quilt.pm (get_patches): Really skip all comments in the series files. --- ChangeLog | 5 +++++ debian/changelog | 2 ++ scripts/Dpkg/Source/Package/V3/quilt.pm | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4286dfc7..53d51a80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-05 Raphael Hertzog + + * scripts/Dpkg/Source/Package/V3/quilt.pm (get_patches): Really + skip all comments in the series files. + 2008-06-04 Raphael Hertzog * scripts/Dpkg/Source/Patch.pm (analyze): Enhance function to diff --git a/debian/changelog b/debian/changelog index 84e5a82d..cb00f3b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ dpkg (1.14.20) UNRELEASED; urgency=low apply all of debian/patches/*.{diff,patch}. * Improve patch parser to accept more patches that are accepted by patch itself. + * Correctly skip comments in quilt series files (concerns "3.0 (quilt)" source + packages). [ Helge Kreutzmann ] * Fix a typo in dselect.1 diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm b/scripts/Dpkg/Source/Package/V3/quilt.pm index d201c0bb..7cb8b60e 100644 --- a/scripts/Dpkg/Source/Package/V3/quilt.pm +++ b/scripts/Dpkg/Source/Package/V3/quilt.pm @@ -79,7 +79,7 @@ sub get_patches { open(SERIES, "<" , $series) || syserr(_g("cannot read %s"), $series); while(defined($_ = )) { chomp; s/^\s+//; s/\s+$//; # Strip leading/trailing spaces - s/\s#.*$//; # Strip trailing comment + s/(^|\s+)#.*$//; # Strip comment next unless $_; if (/^(\S+)\s+(.*)$/) { $_ = $1; -- 2.39.5