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

[SCM] Debian package checker branch, master, updated. 2.0.0-rc1-14-g2d55c59



The following commit has been merged in the master branch:
commit eb735ddaf9d76a8ff7736ca84da23b03fe31a653
Author: Frank Lichtenheld <djpig@debian.org>
Date:   Sat Sep 20 11:59:46 2008 +0200

    frontend/lintian: Improve extra information of file-size-mismatch-in-changes-file
    
    Include size mismatch information in the tag output and do not output it
    as a separate message.

diff --git a/frontend/lintian b/frontend/lintian
index 2d5f7dd..789b87f 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -880,7 +880,8 @@ while (my $arg = shift) {
 		    my ($checksum,$size,$file) = split(/\s+/o, $_);
 		    $files{$file}{$alg} = $checksum;
 		    if ($files{$file}{size} != $size) {
-			tag( "file-size-mismatch-in-changes-file", $file );
+			tag( "file-size-mismatch-in-changes-file", $file,
+			     "$files{$file}{size} != $size" );
 		    }
 		}
 	    }
@@ -894,10 +895,10 @@ while (my $arg = shift) {
 		    warn "E: $file does not exist, exiting\n";
 		    exit(-1);
 		}
-		if (-s _ ne $files{$file}{size}) {
-		    print "N: size is $files{$file}{size}, argname is $arg_name, filename is $filename\n";
-
-		    tag( "file-size-mismatch-in-changes-file", $file );
+		my $size = -s _;
+		if ($size ne $files{$file}{size}) {
+		    tag( "file-size-mismatch-in-changes-file", $file,
+			 "$files{$file}{size} != $size");
 		}
 
 		# check checksums

-- 
Debian package checker


Reply to: