X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FDB%2FLoad.pm;h=03ab770636eb8ec3a1d554ad78815f1f17794d8f;hb=466f7faff129a5699c7674f59900a92aa256175d;hp=d08c518c7d0813d24e288cce3b57c71a387741a4;hpb=61b77669c74b06eef7ddca88b379e23fb82c948a;p=debbugs.git

diff --git a/Debbugs/DB/Load.pm b/Debbugs/DB/Load.pm
index d08c518..03ab770 100644
--- a/Debbugs/DB/Load.pm
+++ b/Debbugs/DB/Load.pm
@@ -177,36 +177,45 @@ sub load_bug {
     my $b = $s->resultset('Bug')->update_or_create($bug) or
         die "Unable to update or create bug $bug->{id}";
     $s->txn_do(sub {
-		 $b->set_related_packages('binpackages',
-					  [grep {defined $_ and
-						   length $_ and $_ !~ /^src:/}
-					   make_list($data->{package})],
-					  $param{packages},
-					 );
-		 $b->set_related_packages('srcpackages',
-					  [map {s/src://;
-                                                $_}
-                                           grep {defined $_ and
-						   $_ =~ /^src:/}
-					   make_list($data->{package})],
-					  $param{packages},
-					 );
-		 $b->set_related_packages('affects_binpackages',
-					  [grep {defined $_ and
-						   length $_ and $_ !~ /^src:/}
-					   make_list($data->{affects})
-					  ],
-					  $param{packages},
-					 );
-		 $b->set_related_packages('affects_srcpackages',
-					  [map {s/src://;
-                                                $_}
-                                           grep {defined $_ and
-						   $_ =~ /^src:/}
-					   make_list($data->{affects})],
-					  $param{packages},
-					 );
-		 for my $ff (qw(found fixed)) {
+                   my @unknown_packages;
+                   my @unknown_affects_packages;
+                   push @unknown_packages,
+                       $b->set_related_packages('binpackages',
+                                                [grep {defined $_ and
+                                                           length $_ and $_ !~ /^src:/}
+                                                 make_list($data->{package})],
+                                                $param{packages},
+                                               );
+                   push @unknown_packages,
+                       $b->set_related_packages('srcpackages',
+                                                [map {s/src://;
+                                                      $_}
+                                                 grep {defined $_ and
+                                                           $_ =~ /^src:/}
+                                                 make_list($data->{package})],
+                                                $param{packages},
+                                               );
+                   push @unknown_affects_packages,
+                       $b->set_related_packages('affects_binpackages',
+                                                [grep {defined $_ and
+                                                           length $_ and $_ !~ /^src:/}
+                                                 make_list($data->{affects})
+                                                ],
+                                                $param{packages},
+                                               );
+                   push @unknown_affects_packages,
+                       $b->set_related_packages('affects_srcpackages',
+                                                [map {s/src://;
+                                                      $_}
+                                                 grep {defined $_ and
+                                                           $_ =~ /^src:/}
+                                                 make_list($data->{affects})],
+                                                $param{packages},
+                                               );
+                   $b->unknown_packages(join(', ',@unknown_packages));
+                   $b->unknown_affects(join(', ',@unknown_affects_packages));
+                   $b->update();
+                   for my $ff (qw(found fixed)) {
 		       my @elements = $s->resultset('BugVer')->search({bug => $data->{bug_num},
 								       found  => $ff eq 'found'?1:0,
 								      });
@@ -254,19 +263,21 @@ sub load_bug {
     # yet, we can't handle them until we've loaded all bugs. queue
     # them up.
     for my $merge_block (qw(mergedwith blocks)) {
-        if (@{$data->{$merge_block}||[]}) {
-            my $count = $s->resultset('Bug')->
+        my $count = 0;
+        if (@{$data->{$merge_block}}) {
+            $count =
+                $s->resultset('Bug')->
                 search({id => [@{$data->{$merge_block}}]})->
                 count();
-            # if all of the bugs exist, immediately fix the merge/blocks
-            if ($count == @{$data->{$merge_block}}) {
-                handle_load_bug_queue(db=>$s,
-                                      queue => {$merge_block,
-                                               {$data->{bug_num},[@{$data->{$merge_block}}]}
-                                               });
-            } else {
-                $queue->{$merge_block}{$data->{bug_num}} = [@{$data->{$merge_block}}];
-            }
+        }
+        # if all of the bugs exist, immediately fix the merge/blocks
+        if ($count == @{$data->{$merge_block}}) {
+            handle_load_bug_queue(db=>$s,
+                                  queue => {$merge_block,
+                                           {$data->{bug_num},[@{$data->{$merge_block}}]}
+                                           });
+        } else {
+            $queue->{$merge_block}{$data->{bug_num}} = [@{$data->{$merge_block}}];
         }
     }
 
@@ -310,6 +321,7 @@ sub handle_load_bug_queue{
     for my $queue_type (keys %queue_types) {
         my $qt = $queue_types{$queue_type};
         my @bugs = keys %{$queue->{$queue_type}};
+        next unless @bugs;
         my @entries;
         for my $bug (@bugs) {
             push @entries,
@@ -503,7 +515,7 @@ sub load_debinfo {
     if (not defined $cache->{bp}{$binname}) {
         $cache->{bp}{$binname} =
             $s->resultset('BinPkg')->
-            get_bin_pkg_id($binname);
+            get_or_create_bin_pkg_id($binname);
     }
     $bp = $cache->{bp}{$binname};
     $s->resultset('BinVer')->
@@ -613,7 +625,7 @@ sub load_packages {
 	    sub {
 		for my $svm (@_) {
 		    my $s_id = $schema->resultset('SrcPkg')->
-			get_src_pkg_id($svm->[0]);
+			get_or_create_src_pkg_id($svm->[0]);
 		    my $sv_id = $schema->resultset('SrcVer')->
 			get_src_ver_id($s_id,$svm->[1],$maints->{$svm->[2]});
 		    $schema->resultset('SrcAssociation')->
@@ -680,11 +692,11 @@ sub load_packages {
 	sub {
 	    for my $bvm (@_) {
 		my $s_id = $schema->resultset('SrcPkg')->
-		    get_src_pkg_id($bvm->{source});
+		    get_or_create_src_pkg_id($bvm->{source});
 		my $sv_id = $schema->resultset('SrcVer')->
 		    get_src_ver_id($s_id,$bvm->{src_ver},$maints->{$bvm->{maint}});
 		my $b_id = $schema->resultset('BinPkg')->
-		    get_bin_pkg_id($bvm->{bin});
+		    get_or_create_bin_pkg_id($bvm->{bin});
 		my $bv_id = $schema->resultset('BinVer')->
 		    get_bin_ver_id($b_id,$bvm->{bin_ver},
 				   $archs->{$bvm->{arch}},$sv_id);