Changeset 2015 in ProjectBuilder for devel/pb

Timestamp:

Nov 25, 2015, 6:05:56 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Fix TDIR chmod by placing the call in build2v when using docker

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -1573 +1573 @@
 
     pb_mkdir_p("$ENV{'PBBUILDDIR'}") if (! -d "$ENV{'PBBUILDDIR'}");
-    # Need to be traversed by others if using containers
-    chmod 0751,"$ENV{'PBBUILDDIR'}";
     chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
     my $made = ""; # pkgs made during build
@@ -3148 +3146 @@
 my $pbstep;
 
+$vetype = pb_ve_get_type($vetype);
 if ($action eq "prep") {
     $pbstep = 2;
 } else {
     $pbstep = 3;
+    # Need to be traversed by others if using containers
+    if (($vtype eq "ve") && ($vetype eq "docker")) {
+        chmod 0751,"$ENV{'PBBUILDDIR'}";
+    }
 }
 
@@ -3221 +3224 @@
 
     # VE needs a good /proc, tolerate one being potentially left around after a failure
-    $vetype = pb_ve_get_type($vetype);
     if (($vtype eq "ve") && ($vetype ne "docker")) {
         print SCRIPT "[ -d /proc/1 ] || sudo /bin/mount -t proc /proc /proc\n";