lintian: r1062 - in trunk: checks debian testset/scripts/debian/patches
Author: rra
Date: 2007-12-08 01:07:14 +0100 (Sat, 08 Dec 2007)
New Revision: 1062
Modified:
trunk/checks/patch-systems
trunk/debian/changelog
trunk/testset/scripts/debian/patches/00list
Log:
* checks/patch-systems:
+ [RA] Ignore blank lines in 00list and don't report them as patches
without descriptions. Thanks, Julien BLACHE. (Closes: #454730)
Modified: trunk/checks/patch-systems
===================================================================
--- trunk/checks/patch-systems 2007-12-07 20:55:47 UTC (rev 1061)
+++ trunk/checks/patch-systems 2007-12-08 00:07:14 UTC (rev 1062)
@@ -58,7 +58,8 @@
my @patches;
while(<IN>) {
chomp;
- next if (/^#/); #ignore comments
+ 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", $_;
@@ -74,7 +75,7 @@
#stop if something looking like a patch starts:
last if /^---/;
#note comment if we find a proper one
- $has_comment = 1 if (/^#+\s*DP:\s*(.*)$/ && $1 !~ /^no description\.?$/i)
+ $has_comment = 1 if (/^\#+\s*DP:\s*(.*)$/ && $1 !~ /^no description\.?$/i)
}
close(PATCH_FILE);
unless ($has_comment) {
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-12-07 20:55:47 UTC (rev 1061)
+++ trunk/debian/changelog 2007-12-08 00:07:14 UTC (rev 1062)
@@ -24,13 +24,16 @@
* checks/nmu:
+ [RA] No packages with ubuntu in the version number are NMUs. Merged
from the Ubuntu patch.
+ * checks/patch-systems:
+ + [RA] Ignore blank lines in 00list and don't report them as patches
+ without descriptions. Thanks, Julien BLACHE. (Closes: #454730)
* frontend/lintian:
+ [RA] If the version number indicates an Ubuntu package, check
against a different list of allowable distributions. Merged from
the Ubuntu patch.
- -- Russ Allbery <rra@debian.org> Fri, 07 Dec 2007 12:08:32 -0800
+ -- Russ Allbery <rra@debian.org> Fri, 07 Dec 2007 16:02:27 -0800
lintian (1.23.38) unstable; urgency=low
Modified: trunk/testset/scripts/debian/patches/00list
===================================================================
--- trunk/testset/scripts/debian/patches/00list 2007-12-07 20:55:47 UTC (rev 1061)
+++ trunk/testset/scripts/debian/patches/00list 2007-12-08 00:07:14 UTC (rev 1062)
@@ -1,3 +1,5 @@
01_not_here_right_now.dpatch
+
02_i_dont_have_a_description.patch
+# some comment
03_specified_without_dpatch
Reply to: