Author: adam-guest
Date: 2008-02-29 06:41:02 +0000 (Fri, 29 Feb 2008)
New Revision: 1081

Modified:
   trunk/debian/changelog
   trunk/scripts/checkbashisms.pl
Log:
checkbashisms: Fix a couple of brown paper bag issues with the >&file
  and herestring checks added in the last release. Thanks to Raphael
  Geissert for spotting the breakage so quickly.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-02-28 22:53:02 UTC (rev 1080)
+++ trunk/debian/changelog      2008-02-29 06:41:02 UTC (rev 1081)
@@ -1,7 +1,13 @@
 devscripts (2.10.18) UNRELEASED; urgency=low
 
+  [ Patrick Schoenfeld ]
   * licensecheck: Detect a less common form of GPL usage
 
+  [ Adam D. Barratt ]
+  * checkbashisms: Fix a couple of brown paper bag issues with the >&file
+    and herestring checks added in the last release. Thanks to Raphael
+    Geissert for spotting the breakage so quickly.
+
  -- Patrick Schoenfeld <[EMAIL PROTECTED]>  Thu, 28 Feb 2008 20:34:18 +0100
 
 devscripts (2.10.17) unstable; urgency=low

Modified: trunk/scripts/checkbashisms.pl
===================================================================
--- trunk/scripts/checkbashisms.pl      2008-02-28 22:53:02 UTC (rev 1080)
+++ trunk/scripts/checkbashisms.pl      2008-02-29 06:41:02 UTC (rev 1081)
@@ -130,7 +130,7 @@
                '(?<![\$\(])\(\(.*\)\)' =>     q<'((' should be '$(('>,
                '(\[|test)\s+-a' =>            q<test with unary -a (should be 
-e)>,
                '\&>' =>                       q<should be \>word 2\>&1>,
-               '(<\&|>\&)\s*(-[^\s;|]|\d+[^\s;|]|[^-\d\s;|])' =>
+               '(<\&|>\&)\s*(-[^\s;|]|\d+[^\s;|)]|[^-\d\s;|])' =>
                                               q<should be \>word 2\>&1>,
                '(?:^|\s+)kill\s+-[^sl]\w*' => q<kill -[0-9] or -[A-Z]>,
                '(?:^|\s+)trap\s+["\']?.*["\']?\s+.*[1-9]' => q<trap with 
signal numbers>,
@@ -206,7 +206,7 @@
 
            # Only look for the beginning of a heredoc here, after we've
            # stripped out quoted material, to avoid false positives.
-           if (m/(^|[^\<])\<\<\s*[\'\"]?(\w+)[\'\"]?/) {
+           if (m/(?:^|[^<])\<\<\s*[\'\"]?(\w+)[\'\"]?/) {
                $cat_string = $1;
            }
        }



-- 
To unsubscribe, send mail to [EMAIL PROTECTED]

Reply via email to