[backend] followup builds for kiwi may be run as root

openSUSE · May 8, 2015 · 38f3046 · 38f3046
1 parent 6ef6939
commit 38f3046
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/backend/bs_worker b/src/backend/bs_worker
@@ -2560,6 +2560,7 @@ sub dobuild {
       getbinaries($buildinfo, $pkgdir, $srcdir, $preinstallimagedata);
     }
     undef $oldpkgdir;
+    $buildinfo->{'rootforbuild'} = 1 if $buildinfo->{'file'} =~ /\.kiwi$/;
     $buildinfo->{'file'} = $followupmode;
     # recalc kiwimode as we changed the file
     undef $kiwimode;
@@ -2704,7 +2705,7 @@ sub dobuild {
   push @args, '--clean';
   push @args, '--changelog';
   push @args, '--oldpackages', $oldpkgdir if $oldpkgdir && -d $oldpkgdir;
-  push @args, '--norootforbuild' unless $BSConfig::norootexceptions && grep {"$projid/$packid" =~ /^$_$/} keys %$BSConfig::norootexceptions;
+  push @args, '--norootforbuild' unless $buildinfo->{'rootforbuild'} || ($BSConfig::norootexceptions && grep {"$projid/$packid" =~ /^$_$/} keys %$BSConfig::norootexceptions);
   push @args, '--baselibs-internal';
   push @args, '--lint';
   push @args, '--dist', "$buildroot/.build.config";