[SCM] Debian package checker branch, master, updated. 2.5.13-30-g9f1bede
The following commit has been merged in the master branch:
commit 42a5833ffa38c048cbea2906a7073de2a8dd4f47
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Sat Jun 15 17:42:39 2013 +0200
Fix a new gfdl false positive
Fix a false positive in parsewiki
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft.pm b/checks/cruft.pm
index 00ec871..7fc3c5a 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -484,7 +484,7 @@ sub find_cruft {
my $s = qr{(?:
\s | # regular space(s)
\@c(?:omment)? | # Tex info comment
- [%\*\"\|] | # String, C-style comment/javadoc indent, quotes for strings, pipe in some txt
+ [%\*\"\|\\] | # String, C-style comment/javadoc indent, quotes for strings, pipe and antislash in some txt
\"\s*, | # String array (e.g. "line1",\n"line2")
,\s*\" | # String array (e.g. "line1"\n ,"line2"), seen in findutils
\\n | # Verbatim \n in string array
@@ -493,7 +493,7 @@ sub find_cruft {
<br\s*/?> | # (X)HTML line breaks
</?link.*?> | # xml link
</?a.*?> | # a link
- </?p.*?> | # html link
+ </?p.*?> | # html paragraph
\(\*note.*?::\) | # info file note
)}xsmo;
# GFDL license, assume it is bad unless it
@@ -518,6 +518,15 @@ sub find_cruft {
/xismo) {
# no invariant libnss-pgsql version
}
+ 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*)?
+ without $s+ any $s+ Invariant $s+ Sections $s*
+ (?: [,\.;] $s*)? \Z
+ /xismo) {
+ # no invariant parsewiki version
+ }
when(m/(?: [,\.;] $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*
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/parsewiki.txt b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/parsewiki.txt
new file mode 100644
index 0000000..950d936
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/parsewiki.txt
@@ -0,0 +1,4 @@
+Permission is granted to copy, distribute and/or modify this document under \
+the terms of the GNU Free Documentation License, Version 1.1 or any later \
+version published by the Free Software Foundation; without any Invariant \
+Sections. A copy of the license is included in the file GFDL.
--
Debian package checker
Reply to: