Changeset 883 in ProjectBuilder for devel

Timestamp:

Oct 23, 2009, 9:00:45 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Better usage of variables in VM, VE only case, and remove dep when ordinary delivery

File:

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

devel/pb/bin/pb

@@ -1144 +1144 @@
     my $conf = "sshconf";
     my $rebuild = "sshrebuild";
-    my $tmout = "vmtmout";
-    my $path = "vmpath";
+    my $tmout = undef;
+    my $path = undef;
     if ($cmt =~ /^VM/) {
         $login = "vmlogin";
         $dir = "pbdefdir";
-        $tmout = "vmtmout";
         $rebuild = "vmrebuild";
         # Specific VM
+        $tmout = "vmtmout";
+        $path = "vmpath";
         $host = "vmhost";
         $port = "vmport";
@@ -1234 +1235 @@
     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,$vepath) = pb_conf_get($host,$login,$dir,$port,$path);
-    # Not mandatory
-    my ($vrebuild,$veconf,$testver,$vtmout) = pb_conf_get_if($rebuild,$conf,"testver",$tmout);
+    my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
+    # Not mandatory...
+    my ($vrebuild,$veconf,$testver) = pb_conf_get_if($rebuild,$conf,"testver");
+    my ($vtmout,$vepath);
+    # ...Except those in virtual context
+    if ($cmt =~ /^VE/) {
+        ($vepath) = pb_conf_get($path);
+    }
+    if ($cmt =~ /^VM/) {
+        ($vtmout) = pb_conf_get($tmout);
+    }
     pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n");
 
@@ -1387 +1396 @@
     $tdir =~ s|\$ENV.+\}/||;
 
-    my $tm = $vtmout->{$ENV{'PBPROJ'}};
+    my $tm = undef;
+    if ($cmt =~ /^VM/) {
+        $tm = $vtmout->{$ENV{'PBPROJ'}};
+    }
 
     # ssh communication if not VE