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

[SCM] Debian package checker branch, master, updated. 2.2.18-88-gb027c14



The following commit has been merged in the master branch:
commit b027c14b2b94b227065fa08899b3f8b500835a89
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Fri Dec 25 23:00:58 2009 -0600

    Fix error in file conditional-detection regexp
    
    Commit 657489 fixed a bug and uncovered another which was detected by
    the test suite.  The original regexp was passing the tests by mere
    chance.

diff --git a/checks/init.d b/checks/init.d
index 2ba3b7c..ff6d230 100644
--- a/checks/init.d
+++ b/checks/init.d
@@ -238,7 +238,7 @@ sub check_init {
 
 	# Pretty dummy way to handle conditionals, but should be enough
 	# for simple init scripts
-	$in_file_test = 1 if ($l =~ m/\bif\s+.+?\[\s+-[fe]\s+/);
+	$in_file_test = 1 if ($l =~ m/\bif\s+.*?\[\s+-[fe]\s+/);
 	$in_file_test = 0 if ($l =~ m/\bfi\b/);
 	if (!$in_file_test && $l =~ m,^\s*\.\s+["'"]?(/etc/default/[\$\w/-]+),) {
 	    tag "init.d-script-sourcing-without-test", "/etc/init.d/$_:$. $1";

-- 
Debian package checker


Reply to: