less strict when parsing ps lines on build boxes
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 19 Jan 2013 07:03:50 +0000 (08:03 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 19 Jan 2013 07:03:50 +0000 (08:03 +0100)
for if e.g. init-vbuild-vserver.sh is used with -P develsfa.pkgs

system/Substrate.py

index 163b1a9..b0d28f0 100644 (file)
@@ -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()