[SCM] Debian package checker branch, master, updated. 2.5.1-91-ge9936d7

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit e9936d77c39bb803df2743a49c047fadf4cc2fb2
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 13 10:34:12 2011 +0200

    Fixed list-binpkg to print the right type of package
    
    harness relies on this to generate the incremental run packages
    file.

diff --git a/unpack/list-binpkg b/unpack/list-binpkg
index dcf216f..43460a0 100755
--- a/unpack/list-binpkg
+++ b/unpack/list-binpkg
@@ -40,6 +40,7 @@ if ($#ARGV == -1) {
 my $verbose = 0;
 my $udeb = 0;
 my $output_file = undef;
+my $type = 'binary';
 
 while (my $arg = shift) {
     if ($arg =~ s,^-,,o) {
@@ -47,6 +48,7 @@ while (my $arg = shift) {
 	    $verbose = 1;
 	} elsif ($arg eq 'u') {
 	    $udeb = 1;
+	    $type = 'udeb';
 	} else {
 	    print STDERR "error: unknown command line argument: $arg\n";
 	    exit 1;
@@ -218,7 +220,7 @@ for my $pkg (sort keys %packages) {
 		   $packages{$pkg}{timestamp},
 		   $packages{$pkg}{area}
 		  ),"\n";
-    printf "N: Listed %s binary package %s %s\n", $packages{$pkg}{status},
+    printf "N: Listed %s $type package %s %s\n", $packages{$pkg}{status},
 	$pkg, $packages{$pkg}{version} if $verbose;
 }
 close(OUT) or fail("cannot close output pipe: $!");
@@ -227,9 +229,9 @@ if ($verbose) {
     # All packages that are still included in %binary_info have disappeared
     # from the archive.
     for my $pkg (sort keys %binary_info) {
-	print "N: Removed binary package $pkg from list\n";
+	print "N: Removed $type package $pkg from list\n";
     }
-    printf "N: Listed %d binary packages\n",$total;
+    printf "N: Listed %d $type packages\n",$total;
 }
 
 exit 0;
@@ -242,7 +244,7 @@ sub safe_get_deb_info {
     if ($@) {
 	# error!
 	print STDERR "$@\n";
-	print "E: general: bad-binary-package $_[0]\n";
+	print "E: general: bad-$type-package $_[0]\n";
 	return;
     }
     $data->{'source'} or ($data->{'source'} = $data->{'package'});

-- 
Debian package checker