From 31d775fed9f70eb7e0639b3585796de11151fdbd Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 14 Jun 2007 16:06:15 +0100
Subject: [PATCH]  * Fix archive selection for queries using get_bugs

---
 cgi/pkgreport.cgi | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index ad4d288..87525d9 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -259,7 +259,9 @@ if (defined $pkg) {
     $title .= " ($verdesc)" if defined $verdesc;
   }
   my @pkgs = split /,/, $pkg;
-  @bugs = get_bugs(package=>\@pkgs);
+  @bugs = get_bugs(package=>\@pkgs,
+		   archive=>$archive
+		  );
 } elsif (defined $src) {
   add_user("$src\@packages.debian.org");
   $title = "source $src";
@@ -271,7 +273,9 @@ if (defined $pkg) {
     my $verdesc = getversiondesc($src);
     $title .= " ($verdesc)" if defined $verdesc;
   }
-  @bugs = get_bugs(src=>[split /,/, $src]);
+  @bugs = get_bugs(src=>[split /,/, $src],
+		   archive=>$archive
+		  );
 } elsif (defined $maint) {
   add_user($maint);
   $title = "maintainer $maint";
@@ -285,7 +289,9 @@ if (defined $pkg) {
 			      return 0;
 			 })};
   } else {
-       @bugs = get_bugs(maint=>[map {lc ($_)} split /,/,$maint]);
+       @bugs = get_bugs(maint=>[map {lc ($_)} split /,/,$maint],
+			archive=>$archive
+		       );
   }
 } elsif (defined $maintenc) {
   my %maintainers = %{getmaintainers()};
@@ -305,7 +311,9 @@ if (defined $pkg) {
   $title = "submitter $submitter";
   $title .= " in $dist" if defined $dist;
   my @submitters = map {lc ($_)} split /,/, $submitter;
-  @bugs = get_bugs(submitter => \@submitters);
+  @bugs = get_bugs(submitter => \@submitters,
+		   archive=>$archive
+		  );
 } elsif (defined($severity) && defined($status)) {
   $title = "$status $severity bugs";
   $title .= " in $dist" if defined $dist;
@@ -343,7 +351,9 @@ elsif (defined $owner) {
      $title .= " in $dist" if defined $dist;
      my @owners = map {lc ($_)} split /,/, $owner;
      my %bugs = ();
-     @bugs = get_bugs(owner=>\@owners);
+     @bugs = get_bugs(owner=>\@owners,
+		      archive=>$archive
+		     );
 
 }
 $title = htmlsanit($title);
-- 
2.39.2