Changeset 444 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

May 19, 2008, 10:51:50 AM (16 years ago)

Author:

Bruno Cornec

Message:

Solve a problem with multiple pbscript files by placing them in different dirs so that they are unique and do not create problems when recursing in send2target

File:

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

devel/pb/bin/pb

@@ -791 +791 @@
     my $vmpid = shift || 0;             # 0 is FALSE
 
-    pb_log(2,"DEBUG: pb_send2target($cmt,$v,$vmexist,$vmpid)\n");
+    pb_log(2,"DEBUG: pb_send2target($cmt,".Dumper($v).",$vmexist,$vmpid)\n");
     my $host = "sshhost";
     my $login = "sshlogin";
@@ -855 +855 @@
 
     if (($cmt eq "vm") || ($cmt eq "ve")) {
-        $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc";
+        $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript";
     } elsif ($cmt eq "Script") {
-        # Nothing special to do
+        $src="$src $ENV{'PBDESTDIR'}/pbscript";
     } elsif ($cmt eq "Packages") {
         # Get package list from file made during build2pkg
@@ -864 +864 @@
         chomp($src);
         close(KEEP);
-
-    }
-    # Systematically adds the pbscript except for Sources
-    $src="$src $ENV{'PBDESTDIR'}/pbscript" if ($cmt ne "Sources");
+        $src="$src $ENV{'PBBUILDDIR'}/pbscript" if ($cmt ne "Sources");
+    }
     # Remove potential leading spaces (cause problem with basename)
     $src =~ s/^ *//;
@@ -919 +917 @@
 
         # Repository management
-        open(PBS,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
+        open(PBS,"> $ENV{'PBBUILDDIR'}/pbscript") || die "Unable to create $ENV{'PBBUILDDIR'}/pbscript";
         if ($dtype eq "rpm") {
             # Also make a pbscript to generate yum/urpmi bases
@@ -960 +958 @@
         }
         close(PBS);
+        chmod 0755,"$ENV{'PBBUILDDIR'}/pbscript";
 
     } else {
@@ -998 +997 @@
     pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $cptarget");
     pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $src $cptarget 2> /dev/null","$cmt delivery in $cptarget");
+
     # For VE we need to change the owner manually - To be tested if needed
     #if ($cmt eq "ve") {