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

[SCM] Debian package checker branch, master, updated. 2.2.10-81-gf594b61



The following commit has been merged in the master branch:
commit f594b6140aff8d7319f4b6863ba7f21718b5cf62
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Fri May 29 21:46:50 2009 +0100

    Revert "Detect arguments passed to sourced scripts inside conditional statements"
    
    This reverts commit d7fb22c83ee27686a8ae510f7f5bdc95f7a784d7.
    
    Further testing in checkbashisms has shown that this change introduces a
    number of false positives.  It has therefore been reverted until a less
    FP-prone replacement can be found.

diff --git a/checks/scripts b/checks/scripts
index 4ff2fa2..8440d2b 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -700,8 +700,8 @@ while (<SCRIPTS>) {
 		# detect source (.) trying to pass args to the command it runs
 		# The first expression weeds out '. "foo bar"'
 		if (not $found and
-		    not m/$LEADIN\.\s+(\"[^\"]+\"|\'[^\']+\')\s*(\&|\||\d?>|<|;|\Z)/
-		    and m/$LEADIN(\.\s+[^\s;\`:]+\s+([^\s;]+))/) {
+		    not m/^\s*\.\s+(\"[^\"]+\"|\'[^\']+\')\s*(\&|\||\d?>|<|;|\Z)/
+		    and m/^\s*(\.\s+[^\s;\`:]+\s+([^\s;]+))/) {
 
 		    my $extra;
 		    ($match, $extra) = ($1, $2);
diff --git a/debian/changelog b/debian/changelog
index 6aa4e0d..7793553 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,8 +68,6 @@ lintian (2.2.11) UNRELEASED; urgency=low
       alternative.  Thanks, Guillaume Delacour.  (Closes: #529457)
     + [ADB] Detect shellscript wrappers which embed a call to "exec" in a
       conditional statement.  Thanks, Raphael Geissert.
-    + [ADB] Detect the use of ". foo bar" (passing arguments to a sourced
-      script) inside a conditional statement.  Thanks, Raphael Geissert.
   * checks/shared-libs.desc:
     + [RA] Downgrade certainty of tags for which we recommend overrides.
       Patch from Raphael Geissert.

-- 
Debian package checker


Reply to: