[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.1-36-g510bc2d



The following commit has been merged in the master branch:
commit 510bc2d26df3ea4eaef607742be5e89a6f2be4f7
Author: Jakub Wilk <jwilk@debian.org>
Date:   Wed Jul 6 22:35:12 2011 +0200

    Fixed regex for determine debhelper base file type
    
    Previously Lintian did not properly strip $pkg from $pkg.install
    (and similar) and therefore silently skipped brace expansion checks
    on these files.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/debhelper b/checks/debhelper
index f9d7eaa..d522c52 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -286,7 +286,7 @@ foreach my $file (sort readdir(DEBIAN)) {
 	$seenmaintscript = 1;
     } else {
 	my $base = $file;
-	$base =~ s/^[.]+\.//;
+	$base =~ s/^.+\.//;
 
 	# Check whether this is a debhelper config file that takes a list of
 	# filenames.  If so, check it for brace expansions, which aren't
diff --git a/debian/changelog b/debian/changelog
index c0ef520..80ef749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,9 @@ lintian (2.5.2) UNRELEASED; urgency=low
     + [NT] Do not trigger deprecation warning for dh_python-ply,
       which Lintian incorrectly identified as dh_python.  Thanks
       to Daniele Tricoli for the report.  (Closes: #632693)
+    + [NT] Fix a broken regex that caused Lintian skip brace
+      expansion checks for some debhelper files.  Thanks to
+      Jakub Wilk for the report and the patch.  (Closes: #632883)
   * checks/duplicate-files:
     + [NT] Exclude  __init__.py files from the check as they are
       required even if they are empty.  Thanks to Daniele Tricoli

-- 
Debian package checker


Reply to: