Changeset 144 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 13, 2007, 11:06:04 AM (18 years ago)

Author:

Bruno Cornec

Message:

Solve remaining pbs with VM management for copy of pkgs

File:

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

devel/pb/bin/pb

@@ -453 +453 @@
 
     $port = $sshport->{$ENV{'PBPROJ'}};
-    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $basesrc\"","Preparing $tdir on $mac");
+    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\' | bash\"","Preparing $tdir on $mac");
     pb_system("cd $ENV{'PBBUILDDIR'} ; scp -p -P $port $src $mac:$tdir 2> /dev/null","$cmt delivery in $tdir on $mac");
     pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
@@ -471 +471 @@
             my $j = basename($p);
             pb_system("scp -p -P $port $mac:\'$bdir/$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of $j in $tdir from $mac");
-            $made="$made $odir/$over/$p";
+            $made="$made $odir/$over/$j" if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
         }
         print KEEP "$made\n";
         close(KEEP);
+        pb_system("ssh -q -p $port $mac \"rm -rf $tdir\"","VM cleanup on $mac");
         if (! $vmexist) {
-            pb_system("ssh -q -p $port $mac \"rm -rf $tdir; sudo /usr/bin/poweroff \"; sleep 120 ; if [-d /proc/$vmexist]; then kill $vmexist; fi ; sleep 10","VM cleanup and halt on $mac");
+            pb_system("ssh -q -p $port $mac \"sudo /usr/bin/poweroff \"; sleep 120 ; if [-d /proc/$vmexist]; then kill $vmexist; fi ; sleep 10","VM halt on $mac");
         }
         pb_send2ssh("Packages","$odir"."_"."$over");