* Handle multiple packages in Debbugs::Packages::get_versions (arrayref)

 * Handle multiple packages in version.cgi correctly

diff --git a/Debbugs/Packages.pm b/Debbugs/Packages.pm
index 222bd41a60b716b8c3e4d0bbcc5608453ee355ae..b34e1b5643ba8e8cbb5342be48c7c60ab9a1efb1 100644 (file)
--- a/Debbugs/Packages.pm
+++ b/Debbugs/Packages.pm
@@ -263,7 +263,7 @@ our %_versions_time;
 
 sub get_versions{
      my %param = validate_with(params => \@_,
-                               spec   => {package => {type => SCALAR,
+                               spec   => {package => {type => SCALAR|ARRAYREF,
                                                      },
                                           dist    => {type => SCALAR|ARRAYREF,
                                                       default => 'unstable',

diff --git a/cgi/version.cgi b/cgi/version.cgi
index 294f1027f4bb14fdc2387a3fcf7abee88f4dec67..7e19e9e118c79435de57b76e7a505f0d6f1eba42 100755 (executable)
--- a/cgi/version.cgi
+++ b/cgi/version.cgi
@@ -20,7 +20,7 @@ use Debbugs::Config qw(:config);
 use Debbugs::CGI qw(htmlize_packagelinks html_escape cgi_parameters munge_url);
 use Debbugs::Versions;
 use Debbugs::Versions::Dpkg;
-use Debbugs::Packages qw(getversions makesourceversions);
+use Debbugs::Packages qw(get_versions makesourceversions);
 use HTML::Entities qw(encode_entities);
 use File::Temp qw(tempdir);
 use IO::File;
@@ -55,7 +55,10 @@ my $this = munge_url('version.cgi?',
 my %versions;
 my %version_to_dist;
 for my $dist (@{$config{distributions}}) {
-     $versions{$dist} = [getversions($cgi_var{package},$dist)];
+     $versions{$dist} = [get_versions(package => [split /\s*,\s*/, $cgi_var{package}],
+                                     dist => $dist,
+                                     source => 1,
+                                    )];
      # make version_to_dist
      foreach my $version (@{$versions{$dist}}){
          push @{$version_to_dist{$version}}, $dist;
@@ -105,7 +108,7 @@ END
 # turn found and fixed into full versions
 @{$cgi_var{found}} = map {makesourceversions($_,undef,@{$cgi_var{found}})} split/\s*,\s*/, $cgi_var{package};
 @{$cgi_var{fixed}} = map {makesourceversions($_,undef,@{$cgi_var{fixed}})} split/\s*,\s*/, $cgi_var{package};
-my @interesting_versions = makesourceversions($cgi_var{package},undef,keys %version_to_dist);
+my @interesting_versions = map {makesourceversions($_,undef,keys %version_to_dist)} split/\s*,\s*/, $cgi_var{package};
 
 # We need to be able to rip out leaves which the versions that do not affect the current versions of unstable/testing
 my %sources;