[SCM] Debian package checker branch, master, updated. 2.5.3-35-g40f9857
The following commit has been merged in the master branch:
commit 40f98574eea88cda0dfe4ff0d351a8c1b15211d2
Author: Jakub Wilk <jwilk@debian.org>
Date: Wed Sep 28 14:07:48 2011 +0200
Only emit "plus X overrides" if there any overrides
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/changelog b/debian/changelog
index c765d25..f815751 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ lintian (2.5.4) UNRELEASED; urgency=low
* reporting/*:
+ [NT] Recognise and display pedantic tags.
+ + [JW] Only emit "plus X overrides" if there any overrides.
-- Niels Thykier <niels@thykier.net> Sat, 10 Sep 2011 13:44:01 +0200
diff --git a/reporting/templates/tags-all.tmpl b/reporting/templates/tags-all.tmpl
index ae73094..84dcd3e 100644
--- a/reporting/templates/tags-all.tmpl
+++ b/reporting/templates/tags-all.tmpl
@@ -14,7 +14,8 @@
my $packages = $stats{$tag}{'packages'};
my $count = $stats{$tag}{'count'};
my $overrides = $stats{$tag}{'overrides'};
- $text = "$packages packages, $count tags, plus $overrides overrides";
+ $text = "$packages packages, $count tags"
+ . ($overrides > 0 ? ", plus $overrides overrides" : "");
} else {
$text = 'Not emitted';
}
diff --git a/reporting/templates/tags-severity.tmpl b/reporting/templates/tags-severity.tmpl
index 5e0e18c..788c024 100644
--- a/reporting/templates/tags-severity.tmpl
+++ b/reporting/templates/tags-severity.tmpl
@@ -26,8 +26,9 @@
my $count = $stats{$tag}{'count'};
my $overrides = $stats{$tag}{'overrides'};
$OUT .= qq( <li><a href="tags/$tag.html">$tag</a>)
- . " ($packages packages, $count tags, plus $overrides"
- . " overrides)</li>\n";
+ . " ($packages packages, $count tags"
+ . ($overrides > 0 ? ", plus $overrides overrides" : "")
+ . ")</li>\n";
}
if ($heading) {
$OUT .= " </ul>\n\n";
diff --git a/reporting/templates/tags.tmpl b/reporting/templates/tags.tmpl
index 1472a77..fc913bf 100644
--- a/reporting/templates/tags.tmpl
+++ b/reporting/templates/tags.tmpl
@@ -14,8 +14,9 @@
my $count = $stats{$tag}{'count'};
my $overrides = $stats{$tag}{'overrides'};
$OUT .= qq( <li><a href="tags/$tag.html">$tag</a>)
- . " ($packages packages, $count tags, plus $overrides overrides)"
- . "</li>\n";
+ . " ($packages packages, $count tags"
+ . ($overrides > 0 ? ", plus $overrides overrides" : "")
+ . ")</li>\n";
}
} </ul>
{ foot() }
--
Debian package checker
Reply to: