fix forward links in pkgreport, add support for indexing on status

diff --git a/Debbugs/SOAP.pm b/Debbugs/SOAP.pm
index ed66b18979faf9ee70dbfbf0089eb619596f133d..5f0138ab209e4ca843c422075e55a9553da07236 100644 (file)
--- a/Debbugs/SOAP.pm
+++ b/Debbugs/SOAP.pm
@@ -276,7 +276,7 @@ sub binary_to_source{
      my $VERSION = __populate_version(pop);
      my ($self,@params) = @_;
 
-     return [binarytosource(@params)];
+     return [Debbugs::Packages::binarytosource(@params)];
 }
 
 =head2 source_to_binary
@@ -297,7 +297,7 @@ sub source_to_binary {
      my $VERSION = __populate_version(pop);
      my ($self,@params) = @_;
 
-     return [source_to_binary(@params)];
+     return [Debbugs::Packages::sourcetobinary(@params)];
 }
 
 =head2 get_versions

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 1af5b038f30621d0245c394a30b502efa2490b94..c61bc01a7604ee601e2d454500d610e0a8dace0d 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -696,7 +696,7 @@ sub pkg_htmlindexentrystatus {
             $result .= ";\n<strong>Forwarded</strong> to "
                        . join(', ',
                              map {maybelink($_)}
-                             split /[,\s]+/,$status{forwarded}
+                             split /\,\s+/,$status{forwarded}
                             );
         }
        # Check the age of the logfile

diff --git a/debian/changelog b/debian/changelog
index bcbb7fbd82439fc133a87509f3ef363eefcf501b..60a8e3cf8e0e7fe209b064e9fa8dcffb6397a25b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -125,7 +125,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Make the moreinfo ack more general (closes: #70810)
     - Use RFC compliant dates in headers (closes: #362935)
     - Add SOAP support (closes: #377520) Thanks to Raphael Hertzog.
-    - Split forwarded on commas for linking (closes: #367813)
+    - Split forwarded on commas for linking (closes: #367813,#473272)
     - Don't display duplicate bugs (closes: #348116)
     - Display links to archived bugs for all searches (closes: #53710)
     - Link to blocked bugs in the bugreport.cgi output (closes: #326077)

diff --git a/scripts/gen-indices.in b/scripts/gen-indices.in
index c7abe97b043deb7e8bf3f9d156e19066316d7187..11775e479edc1f87feb73839a73d7f07b06f628d 100755 (executable)
--- a/scripts/gen-indices.in
+++ b/scripts/gen-indices.in
@@ -103,7 +103,7 @@ if (not lockpid($config{spool_dir}.'/lock/gen-indices')) {
 }
 
 # NB: The reverse index is special; it's used to clean up during updates to bugs
-my @indexes = ('package', 'tag', 'severity','owner','submitter-email','reverse');
+my @indexes = ('package', 'tag', 'severity','owner','submitter-email','status','reverse');
 my $indexes;
 my %slow_index = ();
 my %fast_index = ();