[SCM] Debian package checker branch, lab-refactor, updated. 2.5.3-68-g8e52ca0
The following commit has been merged in the lab-refactor branch:
commit 8e52ca013724b2d870e4cbe7b432bc5a1efad6d6
Author: Niels Thykier <niels@thykier.net>
Date: Sun Sep 25 09:33:48 2011 +0200
Fix auto-remove collections
Also added a FIXME on parts of the -r code, which is needs a "get
package by name" method.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/frontend/lintian b/frontend/lintian
index a66a621..5da8f1c 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -976,6 +976,8 @@ while (my $arg = shift) {
# nothing found so far, so search the lab
+ # FIXME: needs "remove by name"
+
my $b = "$opt{'LINTIAN_LAB'}/binary/$arg";
my $s = "$opt{'LINTIAN_LAB'}/source/$arg";
my $u = "$opt{'LINTIAN_LAB'}/udeb/$arg";
@@ -1496,7 +1498,7 @@ sub auto_clean_package {
for my $coll (keys %collection_info) {
my $ci = $collection_info{$coll};
if (defined($ci->{'auto-remove'}) && $ci->{'auto-remove'} eq 'yes') {
- next unless (-f "$base/.${coll}-$ci->{'version'}");
+ next unless $lpkg->is_coll_finished ($coll, $ci->{'version'});
my $script = "$opt{'LINTIAN_ROOT'}/collection/$ci->{'script'}";
debug_msg(1, "Auto removing: $ci->{'script'} ...");
unless (Lintian::Command::Simple::rundir($base, $script, $pkg_name, "remove-${pkg_type}") == 0) {
--
Debian package checker
Reply to: