Author: adam-guest
Date: 2008-03-25 20:06:09 +0000 (Tue, 25 Mar 2008)
New Revision: 1203

Modified:
   trunk/debian/changelog
   trunk/scripts/checkbashisms.pl
Log:
  + Fix heredoc detection to match '<< \EOT ... EOT' but not
    '<< "\EOT" ... EOT'

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-03-25 18:55:13 UTC (rev 1202)
+++ trunk/debian/changelog      2008-03-25 20:06:09 UTC (rev 1203)
@@ -3,6 +3,8 @@
   * checkbashisms:
     + Strip off the quoted portion of a line that ends a "quoted block" before
       deciding whether it's a comment line and skipping it
+    + Fix heredoc detection to match '<< \EOT ... EOT' but not
+      '<< "\EOT" ... EOT'
 
  -- Adam D. Barratt <[EMAIL PROTECTED]>  Tue, 25 Mar 2008 18:51:59 +0000
 

Modified: trunk/scripts/checkbashisms.pl
===================================================================
--- trunk/scripts/checkbashisms.pl      2008-03-25 18:55:13 UTC (rev 1202)
+++ trunk/scripts/checkbashisms.pl      2008-03-25 20:06:09 UTC (rev 1203)
@@ -328,7 +328,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