Author: rra
Date: 2008-01-03 04:56:25 +0100 (Thu, 03 Jan 2008)
New Revision: 1090

Modified:
   trunk/checks/patch-systems
   trunk/debian/changelog
   trunk/testset/scripts/debian/patches/00list
Log:
* checks/patch-systems:
  + [RA] dpatch permits multiple patches to be listed on the same line
    of 00list.  Patch by Chris Lamb.  (Closes: #457523)

Modified: trunk/checks/patch-systems
===================================================================
--- trunk/checks/patch-systems  2008-01-03 03:08:31 UTC (rev 1089)
+++ trunk/checks/patch-systems  2008-01-03 03:56:25 UTC (rev 1090)
@@ -60,15 +60,15 @@
                                        chomp;
                                        next if (/^\#/); #ignore comments
                                        next if (/^\s*$/); #ignore blank lines
-                                       push @patches, $_;
-                                       if (! -r "debfiles/patches/$_" && ! -r 
"debfiles/patches/$_.dpatch") {
-                                               tag 
"dpatch-index-references-non-existant-patch", $_;
-                                       }
+                                       push @patches, split(' ', $_);
                                }
                                close(IN);
 
-                               #check that we have comments everywhere
+                               # Check each patch.
                                foreach my $patch_file (@patches) {
+                                       if (! -r "debfiles/patches/$patch_file" 
&& ! -r "debfiles/patches/$patch_file.dpatch") {
+                                               tag 
"dpatch-index-references-non-existant-patch", $patch_file;
+                                       }
                                        if (open(PATCH_FILE, '<', 
"debfiles/patches/" . $patch_file)) {
                                                my $has_comment = 0;
                                                while (<PATCH_FILE>) {
@@ -90,4 +90,8 @@
 
 1;
 
+# Local Variables:
+# indent-tabs-mode: t
+# cperl-indent-level: 8
+# End:
 # vim: syntax=perl sw=4 ts=4 noet shiftround

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-01-03 03:08:31 UTC (rev 1089)
+++ trunk/debian/changelog      2008-01-03 03:56:25 UTC (rev 1090)
@@ -13,6 +13,9 @@
     + [RA] Fix non-wm-module-in-wm-modules-menu-section pluralization to
       match the check and reword the long description to be hopefully
       clearer.  Thanks, Martín Ferrari.  (Closes: #457527)
+  * checks/patch-systems:
+    + [RA] dpatch permits multiple patches to be listed on the same line
+      of 00list.  Patch by Chris Lamb.  (Closes: #457523)
   * checks/shared-libs{.desc,}:
     + [RA] New check for version numbers in symbol files.  Based on a
       patch from Raphael Hertzog.  (Closes: #457067)

Modified: trunk/testset/scripts/debian/patches/00list
===================================================================
--- trunk/testset/scripts/debian/patches/00list 2008-01-03 03:08:31 UTC (rev 
1089)
+++ trunk/testset/scripts/debian/patches/00list 2008-01-03 03:56:25 UTC (rev 
1090)
@@ -1,5 +1,4 @@
 01_not_here_right_now.dpatch
 
-02_i_dont_have_a_description.patch
 # some comment
-03_specified_without_dpatch
+02_i_dont_have_a_description.patch 03_specified_without_dpatch


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

Reply via email to