merge changes from source

[debbugs.git] / Debbugs / Packages.pm

diff --git a/Debbugs/Packages.pm b/Debbugs/Packages.pm
index 190d4b46abc9943c62852a7a6d4a9b64f20c77e4..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',
@@ -312,6 +312,7 @@ sub get_versions{
                         my $f_ver = $ver;
                         if ($param{source}) {
                              ($f_ver) = makesourceversions($package,$arch,$ver);
+                             next unless defined $f_ver;
                         }
                         if ($param{time}) {
                              $versions{$f_ver} = max($versions{$f_ver}||0,$version->{$dist}{$arch}{$ver});
@@ -346,6 +347,8 @@ sub makesourceversions {
     my $pkg = shift;
     my $arch = shift;
     my %sourceversions;
+    die "Package $pkg is multiple packages; split on , and call makesourceversions multiple times"
+        if $pkg =~ /,/;
 
     for my $version (@_) {
         if ($version =~ m[/]) {