Skip to content
Browse files

Reduce 2.3 diff - no intended behavior change

  • Loading branch information...
1 parent 6d898d1 commit f556bb31c7e153b73c23dc426844b5e52cdd2897 @gollub gollub committed
Showing with 2 additions and 3 deletions.
  1. +2 −3 src/backend/bs_worker
View
5 src/backend/bs_worker
@@ -1579,9 +1579,9 @@ sub dobuild {
}
unlink("$buildroot/.build.meta");
- rm_rf($oldpkgdir) if -d $oldpkgdir;
rm_rf("$buildroot/.build.packages") if -d "$buildroot/.build.packages";
rm_rf($srcdir) if -d $srcdir;
+ rm_rf($oldpkgdir) if -d $oldpkgdir;
my @meta;
print "fetching sources, ";
@@ -1590,6 +1590,7 @@ sub dobuild {
# fetch sources
if ($deltamode) {
push @meta, getdeltasources($buildinfo, $srcdir);
+ undef $oldpkgdir;
} else {
push @meta, getsources($buildinfo, $srcdir);
}
@@ -1621,8 +1622,6 @@ sub dobuild {
writestr("$buildroot/.build.meta", undef, join("\n", @meta)."\n");
- undef $oldpkgdir if ($buildinfo->{'file'} eq '_delta');
-
getoldpackages($buildinfo, $oldpkgdir) if $oldpkgdir && !$kiwimode;
my @configpath;

0 comments on commit f556bb3

Please sign in to comment.
Something went wrong with that request. Please try again.