Changeset 415 in ProjectBuilder for devel/pb/bin/pb
- Timestamp:
- Apr 26, 2008, 2:45:36 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r409 r415 768 768 my $dir = "sshdir"; 769 769 my $port = "sshport"; 770 my $tmout = "sshtmout";771 my $path = "sshpath";772 770 my $conf = "sshconf"; 773 771 my $rebuild = "sshrebuild"; 772 my $tmout = "vmtmout"; 773 my $path = "vmpath"; 774 774 if (($cmt eq "vm") || ($cmt eq "Script")) { 775 775 $login = "vmlogin"; … … 825 825 if (($cmt eq "vm") || ($cmt eq "ve")) { 826 826 $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc"; 827 # Adds conf file used for final delivery 828 pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb"); 827 829 } elsif ($cmt eq "Script") { 828 830 $src="$src $ENV{'PBDESTDIR'}/pbscript"; … … 850 852 pb_log(0,"Sources handled ($cmt): $src\n"); 851 853 pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf))."\n"); 852 my ($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf) = pb_conf_get($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf); 854 my ($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vepath) = pb_conf_get($host,$login,$dir,$port,$tmout,$path); 855 my ($vrebuild,$veconf) = pb_conf_get_if($rebuild,$conf); 853 856 pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n"); 854 857 # Not mandatory … … 1001 1004 die "-i iso parameter needed" if (((not defined $iso) || ($iso eq "")) && ($create != 0)); 1002 1005 1003 my ($ptr,$vmopt,$vmp ort,$vmpath,$vmtmout,$vmsize) = pb_conf_get("vmtype","vmopt","vmport","vmpath","vmtmout","vmsize");1006 my ($ptr,$vmopt,$vmpath,$vmport,$vmtmout,$vmsize) = pb_conf_get("vmtype","vmopt","vmpath","vmport","vmtmout","vmsize"); 1004 1007 1005 1008 my $vmtype = $ptr->{$ENV{'PBPROJ'}}; … … 1067 1070 } else { 1068 1071 # Get VE context 1069 my ($ptr,$ve path,$vetmout,$verebuild,$veconf) = pb_conf_get("vetype","vepath","vetmout","verebuild","veconf");1072 my ($ptr,$vetmout,$vepath,$verebuild,$veconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf"); 1070 1073 my $vetype = $ptr->{$ENV{'PBPROJ'}}; 1071 1074 … … 1171 1174 my ($scheme2,$uri) = pb_cms_init($pbinit); 1172 1175 1173 my ($pbconf) = pb_conf_ read("$ENV{'PBETC'}","pbconfurl");1176 my ($pbconf) = pb_conf_get("pbconfurl"); 1174 1177 $uri = $pbconf->{$ENV{'PBPROJ'}}; 1175 1178 my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri); … … 1668 1671 # and use its content 1669 1672 # 1670 my ($pbconf) = pb_conf_ read("$ENV{'PBETC'}","pbconfurl");1673 my ($pbconf) = pb_conf_get("pbconfurl"); 1671 1674 pb_log(2,"DEBUG pbconfurl: ".Dumper($pbconf)."\n"); 1672 1675 … … 1691 1694 die "Please create a pbconfurl reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n"; 1692 1695 } 1696 1697 # Adds a potential conf file now as it's more 1698 # important than the project conf file 1699 my ($vmpath,$vepath) = pb_conf_get("vmpath","vepath"); 1700 pb_conf_add("$vmpath->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$vmpath->{$ENV{'PBPROJ'}}/.pbrc"); 1701 pb_conf_add("$vepath->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$vepath->{$ENV{'PBPROJ'}}/.pbrc"); 1693 1702 1694 1703 #
Note:
See TracChangeset
for help on using the changeset viewer.