Changeset 355


Ignore:
Timestamp:
Apr 6, 2008, 2:29:09 AM (11 years ago)
Author:
bruno
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.

Location:
devel/pb
Files:
2 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)");
  • devel/pb/lib/ProjectBuilder/Base.pm

    r353 r355  
    3434our @EXPORT = qw(pb_env_init pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_filter_file_inplace pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout pb_get_date pb_log pb_log_init pb_get_pkg pb_cms_get_pkg pb_get_uri pb_cms_get_uri $debug $LOG);
    3535
    36 $ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
    37 
    3836sub pb_env_init {
    3937
     
    4341my $ver;
    4442my $tag;
     43
     44$ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
    4545
    4646#
     
    910910my $p2;
    911911
    912 pb_log(2,"DEBUG: param1: ".Dumper(@ptr1)."\n");
    913 pb_log(2,"DEBUG: param2: ".Dumper(@ptr2)."\n");
     912pb_log(2,"DEBUG: pb_conf_get param1: ".Dumper(@ptr1)."\n");
     913pb_log(2,"DEBUG: pb_conf_get param2: ".Dumper(@ptr2)."\n");
    914914
    915915foreach my $i (0..$#param) {
     
    950950    }
    951951    $ptr1[$i] = $p1;
    952     pb_log(2,"DEBUG: param ptr1: ".Dumper(@ptr1)."\n");
    953 }
     952}
     953pb_log(2,"DEBUG: pb_conf_get param ptr1: ".Dumper(@ptr1)."\n");
    954954return(@ptr1);
    955955}
Note: See TracChangeset for help on using the changeset viewer.