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

[SCM] Debian package checker branch, master, updated. 2.2.11-19-g05e999c



The following commit has been merged in the master branch:
commit 05e999c0ab818348de58171a498e73dab6b926df
Author: Russ Allbery <rra@debian.org>
Date:   Thu Jun 18 10:40:30 2009 -0700

    $LEADIN should not be anchored in script checks
    
    Fixes several checks for program invocations in maintainer scripts.
    
    * checks/scripts{,.desc}:
      + [RA] Catch more commands with paths in maintainer scripts.  Thanks,
        Raphael Geissert.

diff --git a/checks/scripts b/checks/scripts
index e3fe3bf..df77617 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -821,26 +821,26 @@ while (<SCRIPTS>) {
 		    tag "maintainer-script-modifies-inetd-conf", "$file:$."
 			unless $info->relation('provides')->implies('inet-superserver');
 		}
-		if (m,^$LEADIN(/(usr/)?s?bin/[\w.+-]+)(\s|;|$),) {
+		if (m,$LEADIN(/(usr/)?s?bin/[\w.+-]+)(\s|;|$),) {
 		    tag "command-with-path-in-maintainer-script", "$file:$. $1";
 		}
 
 		# Ancient dpkg feature tests.
-		if (m/^${LEADIN}dpkg\s+--assert-support-predepends\b/) {
+		if (m/${LEADIN}dpkg\s+--assert-support-predepends\b/) {
 		    tag "ancient-dpkg-predepends-check", "$file:$.";
 		}
-		if (m/^${LEADIN}dpkg\s+--assert-working-epoch\b/) {
+		if (m/${LEADIN}dpkg\s+--assert-working-epoch\b/) {
 		    tag "ancient-dpkg-epoch-check", "$file:$.";
 		}
-		if (m/^${LEADIN}dpkg\s+--assert-long-filenames\b/) {
+		if (m/${LEADIN}dpkg\s+--assert-long-filenames\b/) {
 		    tag "ancient-dpkg-long-filenames-check", "$file:$.";
 		}
-		if (m/^${LEADIN}dpkg\s+--assert-multi-conrep\b/) {
+		if (m/${LEADIN}dpkg\s+--assert-multi-conrep\b/) {
 		    tag "ancient-dpkg-multi-conrep-check", "$file:$.";
 		}
 
 		# Commands that should not be used in maintainer scripts.
-		if (m,^${LEADIN}(?:/usr/bin/)?fc-cache(\s|\Z),) {
+		if (m,${LEADIN}(?:/usr/bin/)?fc-cache(\s|\Z),) {
 		    tag 'fc-cache-used-in-maintainer-script', "$file:$.";
 		}
 	    }
diff --git a/debian/changelog b/debian/changelog
index b0ab34a..9202bbb 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,8 @@ lintian (2.2.12) UNRELEASED; urgency=low
     + [RA] Catch obsolete dpkg checks in more contexts.
     + [RA] Check for invocations of fc-cache in maintainer scripts.
       Thanks, Josselin Mouette.  (Closes: #532984)
+    + [RA] Catch more commands with paths in maintainer scripts.  Thanks,
+      Raphael Geissert.
 
   * collection/menu-files{,.desc}:
     + [RA] Collect menu-methods as well as menu files.  Refactor to remove

-- 
Debian package checker


Reply to: