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

[SCM] Debian package checker branch, master, updated. 2.2.13-39-ge27f5f3



The following commit has been merged in the master branch:
commit e27f5f3e3622bcd3dde720eb8b8e326a6a1f411a
Author: Russ Allbery <rra@debian.org>
Date:   Sat Aug 15 15:36:36 2009 -0700

    Make the handling of make variables more robust
    
    * checks/rules{,.desc}:
      + [RA] Make the handling of make variables as rule names more robust
        and avoid generating invalid regexes.

diff --git a/checks/rules b/checks/rules
index f4c47c4..73519da 100644
--- a/checks/rules
+++ b/checks/rules
@@ -247,10 +247,11 @@ while (<RULES>) {
         }
     }
 
-    if (/^([^\s:][^:]*):+(.*)/) {
+    if (!/^ifn?(eq|def)\s/ && /^([^\s:][^:]*):+(.*)/) {
 	@current_targets = split (' ', $1);
         my @depends = map {
-            s/\$\([^\):]+:([^=]+)=([^\)]+)\1\)/$2.*/g;
+            $_ = quotemeta $_;
+            s/\\\$\\\([^\):]+\\:([^=]+)\\=([^\)]+)\1\\\)/$2.*/g;
             qr/^$_$/;
         } split (' ', $2);
 	for my $target (@current_targets) {
diff --git a/debian/changelog b/debian/changelog
index 8314846..25d9ed3 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ lintian (2.2.14) UNRELEASED; urgency=low
     + [RA] Expand Lintian's understanding of which targets are run for the
       clean target to include targets invoked via pattern variable
       expansion.  (Closes: #536405)
+    + [RA] Make the handling of make variables as rule names more robust
+      and avoid generating invalid regexes.
   * checks/patch-systems{,.desc}:
     + [RA] Check for a patch system in use but no debian/README.source.
       Based on a patch from Jonathan Yu.  (Closes: #537969)

-- 
Debian package checker


Reply to: