[SCM] Debian package checker branch, master, updated. 2.2.14-5-g67da2fd
The following commit has been merged in the master branch:
commit 67da2fdfec1a2a3144519a52929f5fcc950a2c41
Author: Jordà Polo <jorda@ettin.org>
Date: Sat Sep 12 09:35:53 2009 +0200
Fix issues with lintian-clean reports
The maintainer's id was missing from the list of variables passed to the
templates, so the displayed URLs to the full report were wrong. However, for
fully lintian-clean reports it doesn't make sense to link to the full report
since it doesn't provide additional information. Those links have now been
removed from lintian-clean reports.
Also, note that the maintainer's id is now passed to the "clean" template for
completeness' sake. It isn't strictly needed, but it may be useful in the
future.
* reporting/{html_reports,templates/clean.tmpl}:
+ [JP] Don't link to full report if the maintainer only has clean
packages. (Closes: #545781)
diff --git a/debian/changelog b/debian/changelog
index a0df0a0..539f737 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ lintian (2.2.15) UNRELEASED; urgency=low
which should not cause manpage-has-errors-from-man to be emitted.
(Closes: #543641)
+ * reporting/{html_reports,templates/clean.tmpl}:
+ + [JP] Don't link to full report if the maintainer only has clean
+ packages. (Closes: #545781)
+
-- Adam D. Barratt <adam@adam-barratt.org.uk> Wed, 26 Aug 2009 21:13:12 +0100
lintian (2.2.14) unstable; urgency=low
diff --git a/reporting/html_reports b/reporting/html_reports
index 30054b7..ba75f78 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -429,9 +429,11 @@ for my $id (keys %clean) {
my ($name, $email) = ($maintainer =~ /^(.*) <([^>]+)>/);
$email = 'unknown' unless $email;
my %data = (
+ id => $id,
email => html_quote (uri_escape ($email)),
maintainer => html_quote ($maintainer),
name => html_quote ($name),
+ clean => 1,
);
print "Generating clean page for $id\n";
output_template ("maintainer/$id", $templates{clean}, \%data);
diff --git a/reporting/templates/clean.tmpl b/reporting/templates/clean.tmpl
index 8317428..63bf1a0 100644
--- a/reporting/templates/clean.tmpl
+++ b/reporting/templates/clean.tmpl
@@ -3,8 +3,12 @@
<p>
All of the packages maintained by {$maintainer} are Lintian-clean.
- But also see the <a href="../full/{$id}">full report</a>, which includes
- info, experimental and overridden tags.
+{
+ if (!$clean) {
+ qq( But also see the <a href="../full/$id">full report</a>)
+ . " which includes info, experimental and overridden tags";
+ }
+}
</p>
<p>
--
Debian package checker
Reply to: