lintian: r892 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2007-06-04 05:29:18 +0200 (Mon, 04 Jun 2007)
New Revision: 892

Modified:
   trunk/checks/scripts
   trunk/debian/changelog
Log:
  + [RA] Move several maintainer script checks specific to shell scripts
    inside the conditional so that they won't run on maintainer scripts
    not written in shell.

Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts	2007-06-04 03:13:36 UTC (rev 891)
+++ trunk/checks/scripts	2007-06-04 03:29:18 UTC (rev 892)
@@ -595,6 +595,18 @@
 		    tag "possible-bashism-in-maintainer-script", "$file:$. \'$match\'";
 		}
 	    }
+	    if (/invoke-rc.d.*\|\| exit 0/) {
+		tag "maintainer-script-hides-init-failure", "$file:$.";
+	    }
+	    if (m,/usr/share/debconf/confmodule,) {
+		$saw_debconf = 1;
+	    }
+	    if (m/^\s*read(?:\s|\z)/ && !$saw_debconf && !$cat_string) {
+		tag "read-in-maintainer-script", "$file:$.";
+	    }
+	    if (m,^\s*rm\s+(.*\s)?/dev/, && !$cat_string) {
+		tag "maintainer-script-removes-device-files", "$file:$.";
+	    }
 	}
 	if (m,\bsuidregister\b,) {
 	    tag "suidregister-used-in-maintainer-script", "$file";
@@ -617,21 +629,9 @@
 		}
 	    }
 	}
-	if (/invoke-rc.d.*\|\| exit 0/) {
-	    tag "maintainer-script-hides-init-failure", "$file:$.";
-	}
 	if (/\bgconftool(-2)?(\s|\Z)/) {
 	    tag "gconftool-used-in-maintainer-script", "$file:$.";
 	}
-	if (m,/usr/share/debconf/confmodule,) {
-	    $saw_debconf = 1;
-	}
-	if (m/^\s*read(?:\s|\z)/ && !$saw_debconf && !$cat_string) {
-	    tag "read-in-maintainer-script", "$file:$.";
-	}
-	if (m,^\s*rm\s+(.*\s)?/dev/, && !$cat_string) {
-	    tag "maintainer-script-removes-device-files", "$file:$.";
-	}
     }
 
     if ($saw_init && ! $saw_invoke) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-06-04 03:13:36 UTC (rev 891)
+++ trunk/debian/changelog	2007-06-04 03:29:18 UTC (rev 892)
@@ -32,11 +32,14 @@
     + [RA] Diagnose removal of device files in maintainer scripts per
       Policy 10.6.  (Closes: #268688)
     + [RA] Add jruby1.0.  Thanks, Sebastien Delafond.  (Closes: #426950)
+    + [RA] Move several maintainer script checks specific to shell scripts
+      inside the conditional so that they won't run on maintainer scripts
+      not written in shell.
 
   * frontend/lintian-info:
     + [CW] Fix uninitialized value warning after reading a blank line.
 
- -- Russ Allbery <rra@debian.org>  Sun, 03 Jun 2007 20:13:20 -0700
+ -- Russ Allbery <rra@debian.org>  Sun, 03 Jun 2007 20:27:18 -0700
 
 lintian (1.23.30) unstable; urgency=low