[SCM] Git repository for devscripts branch, master, updated. v2.12.4-195-g9282e05

James McCoy jamessan at debian.org
Mon Apr 1 11:47:34 UTC 2013


The following commit has been merged in the master branch:
commit 9282e0522058fab1f9f92ccd66756775fe057cde
Author: James McCoy <jamessan at debian.org>
Date:   Mon Apr 1 07:46:57 2013 -0400

    licensecheck: Regex-escape file contents that are used as part of a pattern.
    
    Closes: #704434
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 470826c..ef0bdd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 devscripts (2.13.2) UNRELEASED; urgency=low
 
+  [ Julian Gilbey ]
   * Correct git location in debian/copyright file (Closes: #703853)
 
+  [ James McCoy ]
+  * licensecheck: Regex-escape file contents that are used as part of a
+    pattern.  (Closes: #704434)
+
  -- Julian Gilbey <jdg at debian.org>  Sun, 24 Mar 2013 22:27:57 +0000
 
 devscripts (2.13.1) experimental; urgency=low
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 9331c0e..a771a09 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -363,9 +363,9 @@ sub clean_comments {
                            \s\w
                        }xmg)
     ){
-        my $comment_length=length($first_match);
-        my $comment_re=qr{\s*  [$1]{${comment_length}}  \s*}x;
-        s/^$comment_re//mg;
+	my $comment_length=length($first_match);
+	my $comment_re=qr{\s*  [\Q$1\E]{${comment_length}}  \s*}x;
+	s/^$comment_re//mg;
     }
 
     # Remove Fortran comments

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list