Changeset 883 in ProjectBuilder
- Timestamp:
- Oct 23, 2009, 9:00:45 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r882 r883 1144 1144 my $conf = "sshconf"; 1145 1145 my $rebuild = "sshrebuild"; 1146 my $tmout = "vmtmout";1147 my $path = "vmpath";1146 my $tmout = undef; 1147 my $path = undef; 1148 1148 if ($cmt =~ /^VM/) { 1149 1149 $login = "vmlogin"; 1150 1150 $dir = "pbdefdir"; 1151 $tmout = "vmtmout";1152 1151 $rebuild = "vmrebuild"; 1153 1152 # Specific VM 1153 $tmout = "vmtmout"; 1154 $path = "vmpath"; 1154 1155 $host = "vmhost"; 1155 1156 $port = "vmport"; … … 1234 1235 pb_log(0,"Sources handled ($cmt): $src\n"); 1235 1236 pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf))."\n"); 1236 my ($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vepath) = pb_conf_get($host,$login,$dir,$port,$path); 1237 # Not mandatory 1238 my ($vrebuild,$veconf,$testver,$vtmout) = pb_conf_get_if($rebuild,$conf,"testver",$tmout); 1237 my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port); 1238 # Not mandatory... 1239 my ($vrebuild,$veconf,$testver) = pb_conf_get_if($rebuild,$conf,"testver"); 1240 my ($vtmout,$vepath); 1241 # ...Except those in virtual context 1242 if ($cmt =~ /^VE/) { 1243 ($vepath) = pb_conf_get($path); 1244 } 1245 if ($cmt =~ /^VM/) { 1246 ($vtmout) = pb_conf_get($tmout); 1247 } 1239 1248 pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n"); 1240 1249 … … 1387 1396 $tdir =~ s|\$ENV.+\}/||; 1388 1397 1389 my $tm = $vtmout->{$ENV{'PBPROJ'}}; 1398 my $tm = undef; 1399 if ($cmt =~ /^VM/) { 1400 $tm = $vtmout->{$ENV{'PBPROJ'}}; 1401 } 1390 1402 1391 1403 # ssh communication if not VE
Note:
See TracChangeset
for help on using the changeset viewer.