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

[SCM] Debian package checker branch, master, updated. 2.3.4-33-g4d7501e



The following commit has been merged in the master branch:
commit 5e2cfc4af3861ff18f660ff397785afcdd543a7c
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Wed Jan 6 09:43:14 2010 +0000

    Fix .changes scheduling logic so that subfiles actually get scheduled
    
    Each of the add_*() functions return 1 on success, so the net effect of
    using ||= to accumulate the exit status of each subfile's scheduling was
    that as soon as one file was successfully scheduled all remaining files
    were skipped.

diff --git a/lib/Lintian/Schedule.pm b/lib/Lintian/Schedule.pm
index a61d1a6..7ffdd4f 100644
--- a/lib/Lintian/Schedule.pm
+++ b/lib/Lintian/Schedule.pm
@@ -131,15 +131,15 @@ sub add_changes {
 
 	my ($md5sum,$size,$section,$priority,$file) = split(/\s+/o, $_);
 	if ($file =~ /\.deb$/) {
-	    $status ||= $self->add_deb('b', "$arg_dir/$file");
+	    $status += $self->add_deb('b', "$arg_dir/$file");
 	} elsif ($file =~ /\.udeb$/) {
-	    $status ||= $self->add_deb('u', "$arg_dir/$file");
+	    $status += $self->add_deb('u', "$arg_dir/$file");
 	} elsif ($file =~ /\.dsc$/) {
-	    $status ||= $self->add_dsc("$arg_dir/$file");
+	    $status += $self->add_dsc("$arg_dir/$file");
 	}
     }                                    
 
-    return $status;
+    return ($status ? 0 : 1);
 }
 
 # for each package (the sort is to make sure that source packages are

-- 
Debian package checker


Reply to: