Changeset 139

Timestamp:

09/12/07 11:40:12 (6 years ago)

Author:

bruno

Message:

Build on VMs works now with delivery of built packages on the SSH host

File:

• devel/pb/bin/pb (modified) (1 diff)

devel/pb/bin/pb

@@ -454 +454 @@
         $src =~ s/^ *//;
         pb_mkdir_p("$ENV{'PBBUILDDIR'}/$odir/$over");
+        # Change pgben to make the next send2ssh happy
+        open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to write $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
+        my $made = "";
         foreach my $p (split(/ +/,$src)) {
-            pb_system("scp -p -P $port $mac:\'$bdir/$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of ".basename($p)." in $tdir from $mac");
-        }
+            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/$j\n";
+        }
+        print KEEP "$made\n";
+        close(KEEP);
         #pb_system("ssh -q -p $port $mac \"rm -rf dirname("$sshdir->{$ENV{'PBPROJ'}}"); sudo /usr/bin/poweroff\"","VM cleanup and halt on $mac");
         pb_send2ssh("Packages","$odir"."_"."$over");
-        pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
+        #pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
     }
 }