Fix lack of archive support in pkgindex.cgi.

diff --git a/cgi/pkgindex.cgi b/cgi/pkgindex.cgi
index 855e3fb8599e1fa89b084ef9934b5da86f0b9015..a0e91ae8978b6af7904175e7482e58d3f0ada75d 100755 (executable)
--- a/cgi/pkgindex.cgi
+++ b/cgi/pkgindex.cgi
@@ -67,7 +67,9 @@ my %htmldescrip = ();
 my %sortkey = ();
 if ($indexon eq "pkg") {
   $tag = "package";
-  %count = count_bugs(function => sub {my %d=@_; return splitpackages($d{"pkg"})});
+  %count = count_bugs(function => sub {my %d=@_; return splitpackages($d{"pkg"})},
+                    archive => $archive,
+                    );
   if (defined $param{first}) {
        %count = map {
            if (/^\Q$param{first}\E/) {
@@ -106,7 +108,9 @@ if ($indexon eq "pkg") {
                           return map {
                             $pkgsrc->{$_} || $_
                           } splitpackages($d{"pkg"});
-                         });
+                         },
+                    archive => $archive,
+                    );
   $note = "";
   foreach my $src (keys %count) {
     $sortkey{$src} = lc $src;
@@ -129,7 +133,9 @@ if ($indexon eq "pkg") {
                             }
                             map { $_->address } @me;
                           } splitpackages($d{"pkg"});
-                         });
+                         },
+                    archive => $archive,
+                    );
   if (defined $param{first}) {
        %count = map {
            if (/^\Q$param{first}\E/) {
@@ -157,7 +163,9 @@ if ($indexon eq "pkg") {
                               unless exists $fullname{$addr->address};
                           }
                           map { $_->address } @se;
-                         });
+                         },
+                    archive => $archive,
+                    );
   if (defined $param{first}) {
        %count = map {
            if (/^\Q$param{first}\E/) {
@@ -179,7 +187,9 @@ if ($indexon eq "pkg") {
   $note .= "different addresses.</p>\n";
 } elsif ($indexon eq "tag") {
   $tag = "tag";
-  %count = count_bugs(function => sub {my %d=@_; return split ' ', $d{tags}; });
+  %count = count_bugs(function => sub {my %d=@_; return split ' ', $d{tags}; },
+                     archive => $archive,
+                    );
   if (defined $param{first}) {
        %count = map {
            if (/^\Q$param{first}\E/) {

diff --git a/debian/changelog b/debian/changelog
index 33fe18a5a5ed3dd7a3e3a1329f6ddd5d915c5ae1..9288124b5aa8767cb1bd24752869168918f14acf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
     Gabriel.
   * Only remove list headers if the message appears to have traversed a
     mailing list to get to us. (closes: #690408)
+  * Fix lack of archive support in pkgindex.cgi.
 
   [Thanks to Arnout Engelen: ]
   * Add Homepage (closes: #670555).