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

[SCM] Debian package checker branch, master, updated. 2.1.0-1-gbf90808



The following commit has been merged in the master branch:
commit bf90808cdcc4bfdf275506cffa502e3b59c3eac1
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Fri Nov 28 21:50:55 2008 +0000

    Make command-with-path-in-maintainer-script a little less prone to FPs.
    
    * checks/scripts:
      + Enhance the test for command-with-path-in-maintainer-script to
        better match executions of the command rather than the use of its name
        in pattern matching expressions.  (Closes: #499847)
    
    Don't flag constructs such as:
    
    case $foobar in
      /usr/bin/foobar) barbaz;;
    esac

diff --git a/checks/scripts b/checks/scripts
index a5a1c22..775dc90 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -766,7 +766,7 @@ while (<SCRIPTS>) {
 		    tag "maintainer-script-modifies-inetd-conf", "$file:$."
 			unless Dep::implies($deps{provides}, Dep::parse('inet-superserver'));
 		}
-		if (m,^$LEADIN(/(usr/)?s?bin/[\w.+-]+),) {
+		if (m,^$LEADIN(/(usr/)?s?bin/[\w.+-]+)(\s|;|$),) {
 		    tag "command-with-path-in-maintainer-script", "$file:$. $1";
 		}
 
diff --git a/debian/changelog b/debian/changelog
index 066f476..9b9a0c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lintian (2.1.1) unstable; urgency=low
+
+  * checks/scripts:
+    + [ADB] Enhance the test for command-with-path-in-maintainer-script to
+      better match executions of the command rather than the use of its name
+      in pattern matching expressions.  (Closes: #499847)
+
+ -- Adam D. Barratt <adam@adam-barratt.org.uk>  Fri, 28 Nov 2008 21:47:33 +0000
+
 lintian (2.1.0) unstable; urgency=low
 
   * Summary of tag changes:
diff --git a/testset/maintainer-scripts/debian/postinst b/testset/maintainer-scripts/debian/postinst
index 4fee500..d840aa5 100644
--- a/testset/maintainer-scripts/debian/postinst
+++ b/testset/maintainer-scripts/debian/postinst
@@ -165,3 +165,9 @@ start-stop-daemon --stop --quiet --name foo --startas /usr/bin/foo
 
 # Deprecated chown use with flags.
 chown -R root.root /usr/share/doc/maintainer-scripts
+
+case $mainscript in
+	/usr/bin/foo) foobarbaz;;
+esac
+
+/usr/bin/baz; echo bar

-- 
Debian package checker


Reply to: