[devscripts] 03/03: checkbashisms: Fix unescaped, literal curly brace in regex

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 84d202cf9d4159fe1dbed82a6fc41dac0b1e86df
Author: James McCoy <jamessan at debian.org>
Date:   Wed Jun 17 00:24:04 2015 -0400

    checkbashisms: Fix unescaped, literal curly brace in regex
    
    Closes: #788707
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog         | 3 +++
 scripts/checkbashisms.pl | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 772c77e..58e293f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ devscripts (2.15.6) UNRELEASED; urgency=medium
   [ James McCoy ]
   * debcheckout: Handle Launchpad Git URLs.  Thanks to Colin Watson for the
     patch.  (Closes: #788777)
+  * checkbashisms: Fix unescaped, literal curly brace in regex, causing FTBFS
+    with Perl 5.22.  Thanks to Roderich Schupp for the patch.  (Closes:
+    #788707)
 
  -- Paul Wise <pabs at debian.org>  Wed, 17 Jun 2015 09:51:15 +0800
 
diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
index 9c9500b..567624a 100755
--- a/scripts/checkbashisms.pl
+++ b/scripts/checkbashisms.pl
@@ -548,7 +548,7 @@ sub script_is_evil_and_wrong {
 	    # Finally the whole subexpression may be omitted for scripts
 	    # which do not pass on their parameters (i.e. after re-execing
 	    # they take their parameters (and potentially data) from stdin
-	    .?(\${1:?\+.?)?(\$(\@|\*))?~x) {
+	    .?(\$\{1:?\+.?)?(\$(\@|\*))?~x) {
             $ret = $. - 1;
             last;
         } elsif (/^\s*(\w+)=\$0;/) {
@@ -561,7 +561,7 @@ sub script_is_evil_and_wrong {
 	    # As above
 	    .?\$$var.?\s*
 	    (--\s*)?
-	    .?(\${1:?\+.?)?(\$(\@|\*))?.?\s*\&~x) {
+	    .?(\$\{1:?\+.?)?(\$(\@|\*))?.?\s*\&~x) {
 
 	    $backgrounded = 1;
 	} elsif ($backgrounded and m~

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git