[Apt-listbugs-commits] [apt-listbugs] 01/01: suppress duplicate merged bugs in HTML bug lists

[Francesco Poli]

This is an automated email from the git hooks/post-receive script.

frx-guest pushed a commit to branch master
in repository apt-listbugs.

commit 6a18bc0736519af8f1bbd2841fbd790fa5314490
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Mon Apr 20 23:28:13 2015 +0200

    suppress duplicate merged bugs in HTML bug lists
---
 debian/changelog         | 3 ++-
 lib/aptlistbugs/logic.rb | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 742a2ba..d8a1a7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,8 @@ apt-listbugs (0.1.17) UNRELEASED; urgency=medium
   * improved HTML bug lists (strings are now encoded to be valid XML)
   * fixed RSS output (suppressed double encoding of strings)
   * improved and internationalized RSS output
-  * suppressed duplicate entries for merged bugs in RSS output
+  * suppressed duplicate entries for merged bugs in RSS output and
+    HTML bug lists
   * fixed the suppression of empty tag listings for bugs without tags in
     RSS output
 
diff --git a/lib/aptlistbugs/logic.rb b/lib/aptlistbugs/logic.rb
index df3cddb..7f97605 100644
--- a/lib/aptlistbugs/logic.rb
+++ b/lib/aptlistbugs/logic.rb
@@ -758,7 +758,11 @@ class Viewer
       tmp.puts "    <hr class=\"nocss\" />"
 
       each_state_table(tmp, bugs, @config.stats) { |bugs|
+        p_bug_numbers = []
         bugs.each { |bug|
+          next if p_bug_numbers.include?(bug.bug_number)
+          p_bug_numbers << bug.bug_number
+          p_bug_numbers += bug.mergeids
           pkg_key = bug.pkg_key
           tmp.puts "\n      <tr class=#{bug.severity.encode(:xml => :attr)}>"
           tmp.puts "        <td class=\"pkg\">#{pkg_key.encode(:xml => :text)}</td>"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/apt-listbugs/apt-listbugs.git