[backend] fix new full handling code bugs

openSUSE · Jan 15, 2014 · 09e7193 · 09e7193
1 parent f0017a1
commit 09e7193
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/backend/bs_sched b/src/backend/bs_sched
@@ -2024,7 +2024,8 @@ sub fctx_rebuild_full {
     # try to clean up _volatile
     my $bininfo = $gbininfo->{'_volatile'};
     my @del;
-    for my $r (sort(keys %$bininfo)) {
+    for (sort(keys %$bininfo)) {
+      my $r = $bininfo->{$_};
       push @del, $r if $r->{'name'} && $newfull->{$r->{'name'}} != $r;
     }
     fctx_remove_from_volatile($fctx, \@del) if @del;
@@ -2369,18 +2370,20 @@ sub update_dst_full {
     my $oldcache = { map {$_->{'id'} => $_} grep {$_->{'id'}} values %$oldbininfo };
     $oldrepo = findbins_dir([ map {"$dst/$_"} grep {/\.(?:$binsufsre)$/ && !/\.delta\.rpm$/} @oldfiles ], $oldcache);
 
-    # move files over
+    # move files over (and rename in import case)
     mkdir_p($dst);
     my %new;
     for my $f (@jobfiles) {
+      next if $importarch && $f eq 'replaced.xml';	# not needed
       if (! -l "$dst/$f" && -d _) {
 	BSUtil::cleandir("$dst/$f");
 	rmdir("$dst/$f");
       }
-      my $df = $importarch ? "::import::$importarch::$f" : $f;
+      my $df = $importarch ? "::import::${importarch}::$f" : $f;
       rename("$jobdir/$f", "$dst/$df") || die("rename $jobdir/$f $dst/$df: $!\n");
       $new{$df} = 1;
       $bininfo->{$df} = $jobbininfo->{$f} if $jobbininfo->{$f};
+      $jobrepo->{"$jobdir/$df"} = delete $jobrepo->{"$jobdir/$f"} if $df ne $f;
     }
     for my $f (grep {!$new{$_}} @oldfiles) {
       if (!$importarch) {