lintian: r1394 - in trunk: debian reporting/templates

[djpig@debian.org]

Author: djpig
Date: 2008-06-19 00:59:51 +0200 (Thu, 19 Jun 2008)
New Revision: 1394

Modified:
   trunk/debian/changelog
   trunk/reporting/templates/tag.tmpl
Log:
My previous changes lead to the wrong package names associated with
the extra info.  Reported by Adam D. Barratt.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-18 21:48:41 UTC (rev 1393)
+++ trunk/debian/changelog	2008-06-18 22:59:51 UTC (rev 1394)
@@ -31,6 +31,9 @@
   
   * debian/copyright:
     + [FL] Add Patrick Schoenfeld (for checks/watch-file).
+  
+  * reporting/templates/tag.tmpl:
+    + [FL] Mark overridden tags.
 
  --
 

Modified: trunk/reporting/templates/tag.tmpl
===================================================================
--- trunk/reporting/templates/tag.tmpl	2008-06-18 21:48:41 UTC (rev 1393)
+++ trunk/reporting/templates/tag.tmpl	2008-06-18 22:59:51 UTC (rev 1394)
@@ -20,21 +20,19 @@
 {
     # We get a list of tag data.  We create a separate paragraph for each
     # package name.
-    my $last = '';
-    my $tag = '';
-    my $has_nonoverridden = 0;
+    my ($last, $tag, $has_nonoverridden);
     for my $info (sort { $a->{package} cmp $b->{package} } @tags) {
-	my $id = "$info->{package} $info->{type}";
-        if ($id ne $last) {
-	    if ($tag) {
+        if (!$last
+	    or "$info->{package} $info->{type}" ne "$last->{package} $last->{type}") {
+	    if ($last) {
 		my $overridden = $has_nonoverridden ? '' : qq{<span class="type-O">O</span> };
-		$OUT .= qq(  <h2 class="tag">$overridden<a href="../full/$info->{xref}">);
-		$OUT .= "$info->{package}</a> ($info->{type})</h2>\n";
+		$OUT .= qq(  <h2 class="tag">$overridden<a href="../full/$last->{xref}">);
+		$OUT .= "$last->{package}</a> ($last->{type})</h2>\n";
         	$OUT .= qq(  <ul class="tag">\n);
+	        $OUT .= $tag;
+	        $OUT .= "</ul>\n";
 	    }
-	    $OUT .= $tag;
-	    $OUT .= "</ul>\n";
-	    $last = $id;
+	    $last = $info;
 	    $tag = '';
 	    $has_nonoverridden = 0;
 	}