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

Timestamp:

Apr 6, 2008, 2:29:09 AM (16 years ago)

Author:

Bruno Cornec

Message:

Fix a problem in build2vm where the new name of the distro wasn't correctly handled when trying to get packages pushed to the ftp server.

File:

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

devel/pb/bin/pb

@@ -848 +848 @@
 
     pb_log(0,"Sources handled ($cmt): $src\n");
+    pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf))."\n");
     my ($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf) = pb_conf_get($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf);
     pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n");
@@ -859 +860 @@
         # Overwrite account value if passed as parameter
         $mac = "$pbaccount\@$sshhost->{$ENV{'PBPROJ'}}" if (defined $pbaccount);
+        pb_log(2, "DEBUG: pbaccount: $pbaccount => mac: $mac\n") if (defined $pbaccount);
     }
 
@@ -938 +940 @@
         close(KEEP);
         pb_system("$shcmd \"rm -rf $tdir $bdir\"","$cmt cleanup");
-        pb_send2target("Packages","$odir"."_"."$over");
+
+        # We want to send them to the ssh account so overwrite what has been done before
+        undef $pbaccount;
+        pb_send2target("Packages",$odir."-".$over."-".$oarch,$vmexist,$vmpid);
         if ((! $vmexist) && ($cmt eq "vm")) {
             pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");