From: Don Armstrong <don@volo>
Date: Sat, 10 Mar 2007 10:19:28 +0000 (-0800)
Subject: fix bug where boring versions were included while collapsing
X-Git-Tag: release/2.6.0~578^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=fa679d62cf5562f6206cf0f09cb36a05bb3f77b0;p=debbugs.git

fix bug where boring versions were included while collapsing
---

diff --git a/cgi/version.cgi b/cgi/version.cgi
index f0765f9..0470140 100755
--- a/cgi/version.cgi
+++ b/cgi/version.cgi
@@ -144,7 +144,10 @@ if ($cgi_var{collapse}) {
 					       or $all_states{$key} eq 'absent');
 	  next if $cgi_var{ignore_boring} and not version_relevant($version,$key,\@interesting_versions);
 	  if (defined $version->{parent}{$key}) {
-	       push @{$reversed_nodes{$version->{parent}{$key}}}, $key;
+	       next if $cgi_var{ignore_boring} and (not defined $all_states{$version->{parent}{$key}}
+						    or $all_states{$version->{parent}{$key}} eq 'absent');
+	       next if $cgi_var{ignore_boring} and not version_relevant($version,$version->{parent}{$key},\@interesting_versions);
+	       push @{$reversed_nodes{$version->{parent}{$key}}},$key;
 	  }
 	  else {
 	       $reversed_nodes{$key} ||=[];
@@ -233,6 +236,7 @@ if ($cgi_var{collapse}) {
      my %used_node;
      foreach my $group (values %group_nodes) {
 	  next if $used_node{$group->{name}};
+	  next if not defined $group->{parent};
 	  $used_node{$group->{name}} = 1;
 	  $dot .= qq("$group->{name}").'->'.q(").
 	       (exists $collapsed_nodes{$group->{parent}}?