[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-122-g12888e8

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

The following commit has been merged in the master branch:
commit f8bb33e154a8443c0234ed9c7499314f6378077f
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Jan 6 17:15:47 2011 +0100

    Reorder some code so check if a collection script be run is not
    scattered around.

diff --git a/frontend/lintian b/frontend/lintian
index 529e016..f9d89ee 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1095,9 +1095,16 @@ require Lintian::DepMap::Properties;
 my $map = Lintian::DepMap::Properties->new();
 
 # {{{ determine which info is needed by the collection scripts
-for my $c (keys %unpack_infos) {
-    if (exists $collection_info{$c}{'needs-info'}) {
-	map { $unpack_infos{$_} = 1; } @{$collection_info{$c}{'needs-info'}};
+if ($action eq 'unpack') {
+    # With --unpack we want all of it
+    for my $c (keys %collection_info) {
+	$unpack_infos{$c} = 1;
+    }
+} else {
+    for my $c (keys %unpack_infos) {
+	if (exists $collection_info{$c}{'needs-info'}) {
+	    map { $unpack_infos{$_} = 1; } @{$collection_info{$c}{'needs-info'}};
+	}
     }
 }
 # }}}
@@ -1120,14 +1127,6 @@ for my $c (keys %checks) {
 }
 # }}}
 
-# {{{ make --unpack collect all info
-if ($action eq 'unpack') {
-    for my $c (keys %collection_info) {
-	$unpack_infos{$c} = 1;
-    }
-}
-# }}}
-
 # {{{ process all packages in the archive?
 if ($check_everything) {
     # make sure package info is available

-- 
Debian package checker