Changeset 1792 in ProjectBuilder

Timestamp:

Sep 10, 2013, 7:52:20 AM (11 years ago)

Author:

Bruno Cornec

Message:

pb_check_ps now returns a list of 2 params systematically so API changed accordingly everywhere

File:

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

devel/pb/bin/pb

@@ -2714 +2714 @@
             } else {
                 # Is the SSH port free? if not kill the existing process using it after a build timeout period
-                my $vmssh = pb_check_ps($tmpcmd,$vmm);
+                my ($vmssh,$void) = pb_check_ps($tmpcmd,$vmm);
                 if ($vmssh) {
                     my $buildtm = $ENV{'PBVMTMOUT'};
@@ -2724 +2724 @@
 
                     sleep $buildtm;
-                    pb_log(0,"WARNING: Killing the process ($vmssh) using port $nport (previous failed VM ?)\n");
+                    pb_log(0,"WARNING: Killing the process ($vmssh) using port $void (previous failed VM ?)\n");
                     kill 15,$vmssh;
                     # Let it time to exit
@@ -2732 +2732 @@
                 # Using system allows to kill it externaly if needed,sosupport that in the call
                 pb_system("sleep $ENV{'PBVMTMOUT'}","Waiting $ENV{'PBVMTMOUT'} s for VM $v to come up","mayfail");
-                $vmpid = pb_check_ps($tmpcmd,$vmm);
+                ($vmpid,$void) = pb_check_ps($tmpcmd,$vmm);
                 pb_log(0,"VM $vmm launched (pid $vmpid)\n");
             }
@@ -4199 +4199 @@
         last;
     }
-    # Maintain compatibility by just returning PID if no port
-    return($vmexist,$vmport) if (defined $vmport);
-    return($vmexist);
+    return($vmexist,$vmport);
 }