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

[SCM] Debian package checker branch, master, updated. 2.5.13-18-g29e2be9



The following commit has been merged in the master branch:
commit 29e2be92b1498fd9c7d853ff38f2bd7def067c1d
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Jun 13 10:48:03 2013 +0200

    c/cruft: Tweak a few regexes
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft b/checks/cruft
index 0ca602d..71d04c5 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -482,7 +482,7 @@ sub find_cruft {
                         # local space
                         my $s = qr{(?:
                           \s              |  # regular space(s)
-                          \@c             |  # Tex info comment
+                          \@c(?:omment)?  |  # Tex info comment
                           [%\*\"\|]       |  # String, C-style comment/javadoc indent, quotes for strings, pipe in some txt
                           \"\s*,          |  # String array (e.g. "line1",\n"line2")
                           ,\s*\"          |  # String array (e.g. "line1"\n ,"line2"), seen in findutils
@@ -534,11 +534,11 @@ sub find_cruft {
                                         $s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)?/xiso) {
                                 # verbatim text of license is ok
                             }
-                            when(m/\A $s* (?:(?:\,|\.|;)$s*)? version $s+ \d+(?:\.\d+)? $s+
+                            when(m/\A $s* (?: [,\.;] $s*)? version $s+ \d+(?:\.\d+)? $s+
                                    (?:or $s+ any $s+ later $s+ version $s+)?
                                    published $s+ by $s+ the $s+ Free $s+ Software $s+ Foundation $s*
-                                   (?:(?:\,|\.|;)$s*)? \z
-                                   /xiso) {
+                                   (?: [,\.;] $s*)? \Z
+                                   /xismo) {
                                 # empty text is ambiguous
                                 tag 'license-problem-gfdl-invariants-empty', $name;
                                 $licenseproblemhash{'gfdl-invariants'} = 1;

-- 
Debian package checker


Reply to: