From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 19 Jan 2013 07:03:50 +0000 (+0100)
Subject: less strict when parsing ps lines on build boxes
X-Git-Tag: tests-5.1-10~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=49fc7552edfa56140a9fbf495820c07ed59b2aa3;p=tests.git

less strict when parsing ps lines on build boxes
for if e.g. init-vbuild-vserver.sh is used with -P develsfa.pkgs
---

diff --git a/system/Substrate.py b/system/Substrate.py
index 163b1a9..b0d28f0 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -353,7 +353,7 @@ class BuildBox (Box):
 
     # inspect box and find currently running builds
     matcher=re.compile("\s*(?P<pid>[0-9]+).*-[bo]\s+(?P<buildname>[^\s]+)(\s|\Z)")
-    matcher_building_vm=re.compile("\s*(?P<pid>[0-9]+).*init-vserver.*-i\s+eth.\s+(?P<buildname>[^\s]+)\s*\Z")
+    matcher_building_vm=re.compile("\s*(?P<pid>[0-9]+).*init-vserver.*\s+(?P<buildname>[^\s]+)\s*\Z")
     def sense(self, options):
         print 'bb',
         self.sense_uptime()