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

[SCM] Debian package checker branch, master, updated. 2.2.13-7-ga5f818a



The following commit has been merged in the master branch:
commit 20492cf3cefd891f83db64f96b98959a364505b3
Author: Russ Allbery <rra@debian.org>
Date:   Tue Jul 21 12:41:30 2009 -0700

    Don't warn about multiple subs using different data
    
    In the needs-info-missing test, don't warn if multiple subs use different
    sets of data.  Lintian::Collect::Source and Lintian::Collect::Binary will
    have this issue by design, and the method of coping in the test case works
    fine.

diff --git a/t/scripts/needs-info-missing.t b/t/scripts/needs-info-missing.t
index 71b0c87..3999fce 100755
--- a/t/scripts/needs-info-missing.t
+++ b/t/scripts/needs-info-missing.t
@@ -40,7 +40,7 @@ for my $module (@MODULES) {
 	if (m/^\s*sub\s+(\w+)/) {
 	    $seen_subs{$1} = 1;
 	}
-	if (m/^\s*#\s*sub\s+(\w+)\s+Needs-Info\s+(.*)$/) {
+	if (m/^\s*\#\s*sub\s+(\w+)\s+Needs-Info\s+(.*)$/) {
 	    my ($sub, $all_info) = ($1, $2);
 	    $seen_needsinfo{$sub} = 1;
 	    $all_info =~ s/\s//g;
@@ -52,8 +52,6 @@ for my $module (@MODULES) {
 	    $all_info =~ s/^<>$//;
 	    if (exists($needs_info{$sub})) {
 		if ($all_info ne $needs_info{$sub}) {
-		    push @warnings, "$sub already defined but values don't match:\n"
-				. "\t'$all_info' ($pretty_module) ne '$needs_info{$sub}'\n";
 		    $needs_info{$sub} .= " or $all_info";
 		}
 	    } else {

-- 
Debian package checker


Reply to: