[SCM] Debian package checker branch, master, updated. 1.24.4-125-g0e4f3ef
The following commit has been merged in the master branch:
commit 0e4f3ef33e14db57c374b565c844c868a615273f
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Sat Sep 13 21:05:05 2008 +0100
Fix inverted logic in commit cf36c56cad0d0138a2fe4ff7f44e69cacf836f62
Packages should only be unconditionally included if we're displaying
the full report and checked for including at least one error or
warning tag when displaying the summary report. Also simplify the
process of retrieving data for each package.
Thanks to Frank Lichtenheld for pointing out the logical thinko.
diff --git a/reporting/templates/maintainer.tmpl b/reporting/templates/maintainer.tmpl
index b3a169d..f4cb013 100644
--- a/reporting/templates/maintainer.tmpl
+++ b/reporting/templates/maintainer.tmpl
@@ -30,17 +30,17 @@
# displaying the full report, or the package has error
# or warning tags
my $interesting = 0;
- if ($errors) {
+ if (!$errors) {
+ # Full report, so include the package
$interesting = 1;
} else {
- my $versions = $by_maint{$maintainer}{$source}
- || $by_uploader{$maintainer}{$source};
- for my $version (keys %$versions) {
+ my $versions = $packages{$source} || $uploads{$source};
+ VERSIONS: for my $version (sort keys %$versions) {
my $tags = $versions->{$version};
for my $tag (@$tags) {
- if (($tag->{code} ne 'E') and ($tag->{code} ne 'W')) {
+ if (($tag->{code} eq 'E') or ($tag->{code} eq 'W')) {
$interesting = 1;
- last;
+ last VERSIONS;
}
}
}
--
Debian package checker
Reply to: