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

[SCM] Debian package checker branch, master, updated. 2.4.0-4-g7c9931b



The following commit has been merged in the master branch:
commit 7c9931b929e08fa6020afe76f1133a5043e783ca
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Mon Apr 26 11:35:24 2010 +0100

    --no-override should skip the dependencies of the override-file check
    
    * frontend/lintian:
      + [ADB] Don't add the dependencies of the override-file check script
        to the list of checks to run if --no-override was specified.
        (Closes: #579211)

diff --git a/debian/changelog b/debian/changelog
index 559ede2..eae4ca2 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ lintian (2.4.1) UNRELEASED; urgency=low
   * frontend/lintian:
     + [RG] Remove finished processes from the processes hash to avoid
       trying to kill dead processes.
+    + [ADB] Don't add the dependencies of the override-file check script
+      to the list of checks to run if --no-override was specified.
+      (Closes: #579211)
 
  -- Raphael Geissert <geissert@debian.org>  Sun, 25 Apr 2010 16:16:15 -0500
 
diff --git a/frontend/lintian b/frontend/lintian
index 8d97145..be461e1 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1172,11 +1172,12 @@ unless ($count) {
 # }}}
 
 # {{{ Okay, now really processing the packages in one huge loop
-$map->add('coll-override-file', {'type' => 'collection', 'name' => 'override-file'})
-    unless $no_override;
-if (exists $collection_info{'override-file'}{'needs-info'}) {
-    $map->addp('coll-override-file', 'coll-',
+unless ($no_override) {
+    $map->add('coll-override-file', {'type' => 'collection', 'name' =>  'override-file'});
+    if (exists $collection_info{'override-file'}{'needs-info'}) {
+	$map->addp('coll-override-file', 'coll-',
 		@{$collection_info{'override-file'}{'needs-info'}});
+    }
 }
 v_msg(sprintf("Processing %d packages...", $count));
 debug_msg(1,

-- 
Debian package checker


Reply to: