Просмотр исходного кода

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.
Raphael Hertzog лет назад: 18
Родитель
Сommit
7f752eaecf
3 измененных файлов с 8 добавлено и 1 удалено
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 1
      scripts/Dpkg/Source/Package/V3/quilt.pm

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2008-06-05  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm (get_patches): Really
+	skip all comments in the series files.
+
 2008-06-04  Raphael Hertzog  <hertzog@debian.org>
 
 	* scripts/Dpkg/Source/Patch.pm (analyze): Enhance function to

+ 2 - 0
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

+ 1 - 1
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($_ = <SERIES>)) {
             chomp; s/^\s+//; s/\s+$//; # Strip leading/trailing spaces
-            s/\s#.*$//; # Strip trailing comment
+            s/(^|\s+)#.*$//; # Strip comment
             next unless $_;
             if (/^(\S+)\s+(.*)$/) {
                 $_ = $1;