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

[SCM] Debian package checker branch, master, updated. 2.5.11-131-g4106927



The following commit has been merged in the master branch:
commit 410692794276bb146431cfe07b536c0c1553f3be
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Jan 29 13:32:13 2013 +0100

    lintian: Use @auto_remove instead of $keep_lab as guard
    
    When checking if any auto-removals should be done, use @auto_remove
    rather than $keep_lab as the condition.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/frontend/lintian b/frontend/lintian
index ccb8363..5023d85 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1289,15 +1289,13 @@ sub finish_hook {
     } elsif ($state eq 'unchanged' or $state eq 'changed') {
         # If we are only unpacking stuff, auto-remove colls
         # immediately.
-        if ($action ne 'check') {
+        if ($action ne 'check' and @auto_remove) {
             # we are done now - start auto-cleaning
-            if (!$keep_lab) {
-                my $ret = auto_clean_package($lpkg);
-                # We don't have to remove it from the group if it
-                # fails as we are pretty much done.
-                $exit_code = 2 if $ret < 0;
-                $changed->() if $ret;
-            }
+            my $ret = auto_clean_package($lpkg);
+            # We don't have to remove it from the group if it
+            # fails as we are pretty much done.
+            $exit_code = 2 if $ret < 0;
+            $changed->() if $ret;
         }
     }
 }
@@ -1394,7 +1392,7 @@ sub process_group {
         post_pkg_process_overrides ($lpkg);
     } # end foreach my $lpkg ($group->get_processable)
 
-    if (!$keep_lab) {
+    if (@auto_remove) {
         # Invoke auto-clean now that the group has been checked
         foreach my $lpkg ($group->get_processables){
             my $ret = auto_clean_package($lpkg);

-- 
Debian package checker


Reply to: