[lintian] 03/03: Lie in license check for gfdl in order to check more
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit f6341bb0a08e30954865cb5b047655161102ca43
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Fri Feb 28 17:27:43 2014 +0100
Lie in license check for gfdl in order to check more
If we found pedantic or info violation, continue to check for other violation in next block.
Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/cruft.pm | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/checks/cruft.pm b/checks/cruft.pm
index 0ef0e1e..780fcc0 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -708,9 +708,16 @@ sub _check_gfdl_license_problem {
{}xismo;
# Treat ambiguous empty text
- if ($gfdlsections eq '') {
- tag 'license-problem-gfdl-invariants-empty', $name;
- return 1;
+ unless(
+ defined(
+ $licenseproblemhash->{'license-problem-gfdl-invariants-empty'})
+ ) {
+ if ($gfdlsections eq '') {
+ # lie in order to check more part
+ tag 'license-problem-gfdl-invariants-empty', $name;
+ $licenseproblemhash->{'license-problem-gfdl-invariants-empty'} = 1;
+ return 0;
+ }
}
# official wording
@@ -746,9 +753,12 @@ sub _check_gfdl_license_problem {
if ($name =~ m{$acceptonlyinfile}) {
my $applytag = $gfdl_data->{'tag'};
if(defined($applytag)) {
- # lie will allow to check more block
- _tag_gfdl($applytag, $name, $gfdlsections);
- return 0;
+ unless(defined($licenseproblemhash->{$applytag})) {
+ # lie will allow to check more block
+ _tag_gfdl($applytag, $name, $gfdlsections);
+ $licenseproblemhash->{$applytag} = 1;
+ return 0;
+ }
}
return 0;
}else {
@@ -901,8 +911,8 @@ sub _license_check {
if(defined($licenseproblemdata->{'callsub'})) {
my $subresult= $licenseproblemdata->{'callsub'}->(
- $name, $block,$blocknumber,$matchedkeyword,
- $licenseproblemhash,$$cleanedblock, %+
+ $name, $block,$blocknumber,$cleanedblock,$matchedkeyword,
+ $licenseproblemhash,%+
);
if($subresult) {
$licenseproblemhash->{$licenseproblem} = 1;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: