X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FPackage.pm;h=70f0e35832d828bc290816d039c663746cc4692f;hb=d21c253d6eea9adb44ac3e32098a54c572d0fc5e;hp=661242768cc53542f6e637932d98682eeae48007;hpb=593ab7a9468427ffbe4033aa8942ecd956e46d2c;p=debbugs.git

diff --git a/Debbugs/Package.pm b/Debbugs/Package.pm
index 6612427..70f0e35 100644
--- a/Debbugs/Package.pm
+++ b/Debbugs/Package.pm
@@ -229,6 +229,7 @@ sub _get_valid_version_info_from_db {
                      },
              );
     }
+    my @src_packages = keys %src_packages;
 
     my @bin_ver_search;
     for my $sp (keys %bin_ver_packages) {
@@ -238,6 +239,7 @@ sub _get_valid_version_info_from_db {
                      },
              );
     }
+    my @bin_packages = keys %bin_packages;
     my $packages = {};
     sub _default_pkg_info {
         return {name => $_[0],
@@ -272,9 +274,9 @@ sub _get_valid_version_info_from_db {
             $bp->{$pkg->{bin_pkg}}++;
 	}
     }
-    if (keys %src_packages) {
+    if (@src_packages) {
         my $src_rs = $s->resultset('SrcVer')->
-            search({-or => [-and => {'src_pkg.pkg' => [keys %src_packages],
+            search({-or => [-and => {'src_pkg.pkg' => [@src_packages],
                                      -or => {'suite.codename' => $common_dists,
                                              'suite.suite_name' => $common_dists,
                                             },
@@ -312,10 +314,10 @@ sub _get_valid_version_info_from_db {
                               \%bin_packages,
                              );
     }
-    if (keys %bin_packages) {
+    if (@bin_packages) {
         my $bin_assoc_rs =
             $s->resultset('BinAssociation')->
-            search({-and => {'bin_pkg.pkg' => [keys %bin_packages],
+            search({-and => {'bin_pkg.pkg' => [@bin_packages],
                              -or => {'suite.codename' => $common_dists,
                                      'suite.suite_name' => $common_dists,
                                     },
@@ -653,7 +655,7 @@ sub _create_version {
 	    push @versions,
 		$v,
 		Debbugs::Version::Source->
-		    new(package => $self,
+		    new(pkg => $self,
 			version => $v,
 			package_collection => $self->package_collection,
                         $self->schema_argument,
@@ -664,7 +666,7 @@ sub _create_version {
 	    push @versions,
 		$v,
 		Debbugs::Version::Binary->
-		    new(package => $self,
+		    new(pkg => $self,
 			version => $v,
 			package_collection => $self->package_collection,
                         $self->schema_argument,