Changeset 355 for devel/pb/bin/pb


Ignore:
Timestamp:
Apr 6, 2008, 2:29:09 AM (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r354 r355  
    848848
    849849    pb_log(0,"Sources handled ($cmt): $src\n");
     850    pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf))."\n");
    850851    my ($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf) = pb_conf_get($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf);
    851852    pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n");
     
    859860        # Overwrite account value if passed as parameter
    860861        $mac = "$pbaccount\@$sshhost->{$ENV{'PBPROJ'}}" if (defined $pbaccount);
     862        pb_log(2, "DEBUG: pbaccount: $pbaccount => mac: $mac\n") if (defined $pbaccount);
    861863    }
    862864
     
    938940        close(KEEP);
    939941        pb_system("$shcmd \"rm -rf $tdir $bdir\"","$cmt cleanup");
    940         pb_send2target("Packages","$odir"."_"."$over");
     942
     943        # We want to send them to the ssh account so overwrite what has been done before
     944        undef $pbaccount;
     945        pb_send2target("Packages",$odir."-".$over."-".$oarch,$vmexist,$vmpid);
    941946        if ((! $vmexist) && ($cmt eq "vm")) {
    942947            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)");
Note: See TracChangeset for help on using the changeset viewer.