[backend] do not build a preloadimage with itself

openSUSE · Jun 26, 2012 · 04f7e75 · 04f7e75
1 parent 2a0f9aa
commit 04f7e75
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/backend/bs_worker b/src/backend/bs_worker
@@ -1393,6 +1393,8 @@ sub getpreinstallimage {
       next if @{$img->{'hdrids'} || []} < $bestimgn;
       next unless $img->{'sizek'};
       next if grep {!$neededhdrmd5s{$_}} @{$img->{'hdrids'} || []};
+      # ignore our own image
+      next if $img->{'prpa'} eq "$projid/$repoid/$buildinfo->{'arch'}" && $img->{'package'} eq $buildinfo->{'package'};
       $bestimg = $img;
     }
     last unless $bestimg;	# nothing fits
@@ -1765,7 +1767,7 @@ sub dobuild {
     push @meta, getsources($buildinfo, $srcdir);
     importbuild() unless defined &Build::queryhdrmd5;
     if (!$kiwimode && $Build::Features::preinstallimage && -s "$srcdir/$buildinfo->{'file'}") {
-      # check if we may use a preloadimage
+      # check if we may use a preinstallimage
       local *F;
       my $needbins;
       if (open(F, '<', "$srcdir/$buildinfo->{'file'}")) {