[SCM] Debian package checker branch, master, updated. 2.5.11-21-g76383d3
The following commit has been merged in the master branch:
commit 76383d3989bcfdbf891177875ff606f8a277e78e
Author: Niels Thykier <niels@thykier.net>
Date: Sun Dec 30 15:36:55 2012 +0100
r/t/{tag,packages}.tmpl: Handle multiple versions of a source
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/changelog b/debian/changelog
index 085ca11..1b48448 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,7 +41,9 @@ lintian (2.5.12) UNRELEASED; urgency=low
+ [NT] Schedule groups in chunks (default 512 per chunk).
This makes the Lintian processes shorter and makes memory
reclaimable sooner. (Closes: #695839)
- * reporting/templates/maintainer.tmpl:
+ * reporting/html_reports:
+ + [NT] Update xrefs to include source version.
+ * reporting/templates/{packages,maintainer,tag}.tmpl:
+ [NT] Properly handle multiple versions of the same source and
add versioned anchors to them.
diff --git a/reporting/html_reports b/reporting/html_reports
index fa232a4..709d139 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -163,7 +163,8 @@ my (%statistics, %tag_statistics);
# severity => 'normal',
# certainty => 'certain',
# extra => 'gnubg-data'
-# xref => 'rra@debian.org.html#gnubg' } ] } }
+# xref => 'rra@debian.org.html#gnubg_0.15~20061120-1'
+# } ] } }
#
# and then stored under the key 'Russ Allbery <rra@debian.org>'
#
@@ -285,7 +286,7 @@ while (<>) {
severity => html_quote ($profile->get_tag ($tag, 1)->severity),
certainty => html_quote ($profile->get_tag ($tag, 1)->certainty),
extra => html_quote ($extra),
- xref => maintainer_url ($maintainer) . "#$source"
+ xref => maintainer_url ($maintainer) . "#${source}_${source_version}"
};
$by_maint{$maintainer}{$source}{$source_version} ||= [];
push(@{ $by_maint{$maintainer}{$source}{$source_version} }, $info);
@@ -345,13 +346,13 @@ for my $maintainer (@maintainers) {
# double-counting.
for my $source (keys %{ $by_maint{$maintainer} }) {
my %count;
- for my $version (keys %{ $by_maint{$maintainer}{$source} }) {
+ for my $version (sort versions_comparator keys %{ $by_maint{$maintainer}{$source} }) {
my $tags = $by_maint{$maintainer}{$source}{$version};
for my $tag (@$tags) {
$count{$tag->{code}}++;
}
if (@$tags) {
- $sources{$source} = $tags->[0]->{xref};
+ $sources{$source}{$version} = $tags->[0]->{xref};
}
}
$qa{$source} = \%count;
diff --git a/reporting/templates/packages.tmpl b/reporting/templates/packages.tmpl
index db67979..1b2d337 100644
--- a/reporting/templates/packages.tmpl
+++ b/reporting/templates/packages.tmpl
@@ -17,6 +17,7 @@
</p>
{
+ # ' # hi, emacs
# Put headings before each new initial letter.
my $letter = '';
for my $package (@list) {
@@ -26,7 +27,9 @@
$OUT .= qq( <h2>$first</h2>\n\n <p>\n);
$letter = $first;
}
- $OUT .= qq( <a href="full/$sources{$package}">$package</a>\n);
+ foreach my $version (sort by_version keys %{ $sources{$package} }) {
+ $OUT .= qq( <a href="full/$sources{$package}{$version}">$package ($version)</a>\n);
+ }
}
} </p>
{ foot() }
diff --git a/reporting/templates/tag.tmpl b/reporting/templates/tag.tmpl
index 015040e..a3a686b 100644
--- a/reporting/templates/tag.tmpl
+++ b/reporting/templates/tag.tmpl
@@ -23,11 +23,11 @@
my ($last, $tag, $has_nonoverridden);
for my $info (sort { $a->{package} cmp $b->{package} } @tags) {
if (!$last
- or "$info->{package} $info->{type}" ne "$last->{package} $last->{type}") {
+ or "$info->{package} $info->{type} $info->{version}" ne "$last->{package} $last->{type} $last->{version}") {
if ($last) {
my $overridden = $has_nonoverridden ? '' : qq{ <span class="type-O">overridden</span>};
$OUT .= qq( <h2 class="tag"><a href="../full/$last->{xref}">);
- $OUT .= "$last->{package}</a> ($last->{type})$overridden</h2>\n";
+ $OUT .= "$last->{package} $last->{version}</a> ($last->{type})$overridden</h2>\n";
$OUT .= qq( <ul class="tag">\n);
$OUT .= $tag;
$OUT .= "</ul>\n";
@@ -45,7 +45,7 @@
}
my $overridden = $has_nonoverridden ? '' : qq{ <span class="type-O">overridden</span>};
$OUT .= qq( <h2 class="tag"><a href="../full/$last->{xref}">);
- $OUT .= "$last->{package}</a> ($last->{type})$overridden</h2>\n";
+ $OUT .= "$last->{package} $last->{version}</a> ($last->{type})$overridden</h2>\n";
$OUT .= qq( <ul class="tag">\n);
$OUT .= $tag;
$OUT .= "</ul>\n";
--
Debian package checker
Reply to: