Changeset 2288 in ProjectBuilder

Timestamp:

Sep 4, 2017, 1:21:18 PM (7 years ago)

Author:

Bruno Cornec

Message:

PBVMTMOUT is now takeing precedence over params in conf files

File:

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

devel/pb/bin/pb

@@ -3143 +3143 @@
     # Save the current status for later restoration
     $ENV{'PBOLDVMOPT'} = $ENV{'PBVMOPT'};
-    # Set a default timeout of 2 minutes
-    if (not defined $ENV{'PBVMTMOUT'}) {
-        $ENV{'PBVMTMOUT'} = "120";
-    }
+
     if (defined $vmopt->{$v}) {
         $ENV{'PBVMOPT'} .= " $vmopt->{$v}" if ($ENV{'PBVMOPT'} !~ / $vmopt->{$v}/);
@@ -3179 +3176 @@
         }
     }
-    if (defined $vmtmout->{$v}) {
-        $ENV{'PBVMTMOUT'} = $vmtmout->{$v};
-    } elsif (defined $vmtmout->{$ENV{'PBPROJ'}}) {
-        $ENV{'PBVMTMOUT'} = $vmtmout->{$ENV{'PBPROJ'}};
-    }
+    
+    # Set a default timeout of 2 minutes if none defined externally or in conf files
+    if (not defined $ENV{'PBVMTMOUT'}) {
+        if (defined $vmtmout->{$v}) {
+            $ENV{'PBVMTMOUT'} = $vmtmout->{$v};
+        } elsif (defined $vmtmout->{$ENV{'PBPROJ'}}) {
+            $ENV{'PBVMTMOUT'} = $vmtmout->{$ENV{'PBPROJ'}};
+        }
+    }
+    if (not defined $ENV{'PBVMTMOUT'}) {
+        $ENV{'PBVMTMOUT'} = "120";
+    }
+
     my $nport = pb_get_port($vmport,$pbos,$vtype);