The following commit has been merged in the master branch:
commit c3f3c4015b0fa31084412a95579c684540118b4a
Author: Bastien ROUCARIÈS <[email protected]>
Date: Thu Jan 24 10:05:11 2013 +0100
Avoid false positive with texi
Some texi file use gfdl with @c for comment instead of space.
Avoid false positive by allowing @c
Signed-off-by: Niels Thykier <[email protected]>
diff --git a/checks/cruft b/checks/cruft
index ff66c67..8ab61e0 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -455,28 +455,28 @@ sub find_cruft {
if (!exists $licenseproblemhash{'gfdl-invariants'}) {
my $gfdlsections = $1;
# local space
- my $s = '(?:\s+|\@c)';
- # GFDL license, assume it is bad unless it
+ my $s = '(?:\s|\@c)';
+ # GFDL license, assume it is bad unless it
# explicitly states it has no "bad sections".
given($gfdlsections) {
- when(m/with \s+ (?:the\s+)? no \s+ Invariant \s+
Sections,?
- \s+ (?:with\s+)? (?:the\s+)? no \s+
Front-Cover \s+ Texts,? \s+ and
- \s+ (?:with\s+)? (?:the\s+)? no \s+
Back-Cover \s+ Texts/xis) {
+ when(m/with $s+ (?:the$s+)? no $s+ Invariant $s+
Sections,?
+ $s+ (?:with$s+)? (?:the$s+)? no $s+
Front-Cover $s+ Texts,? $s+ and
+ $s+ (?:with$s+)? (?:the$s+)? no $s+
Back-Cover $s+ Texts/xiso) {
# no invariant
}
- when(m/with \s+ the \s+ Invariant \s+ Sections \s+
being
- \s+ (?:\@var\{|<var>)? LIST \s+ THEIR
\s+TITLES (?:\}|<\/var>)? \s? ,?
- \s+ with \s+ the \s+ Front-Cover \s+
Texts \s+ being
- \s+ (?:\@var\{|<var>)? LIST
(?:\}|<\/var>)? \s? ,?
- \s+ and \s+ with \s+ the \s+
Back-Cover \s+ Texts \s+ being
- \s+ (?:\@var\{|<var>)? LIST
(?:\}|<\/var>)?/xis) {
+ when(m/with $s+ the $s+ Invariant $s+ Sections $s+
being
+ $s+ (?:\@var\{|<var>)? LIST $s+ THEIR
$s+TITLES (?:\}|<\/var>)? $s? ,?
+ $s+ with $s+ the $s+ Front-Cover $s+
Texts $s+ being
+ $s+ (?:\@var\{|<var>)? LIST
(?:\}|<\/var>)? $s? ,?
+ $s+ and $s+ with $s+ the $s+
Back-Cover $s+ Texts $s+ being
+ $s+ (?:\@var\{|<var>)? LIST
(?:\}|<\/var>)?/xiso) {
# verbatim text of license is ok
}
- 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
- /xis) {
+ 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) {
# empty text is ambiguous
tag 'license-problem-gfdl-invariants-empty',
$name;
$licenseproblemhash{'gfdl-invariants'} = 1;
--
Debian package checker
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
