From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 10 Jan 2014 09:16:34 +0000 (+0100)
Subject: fix changes to the build for vs/lxc
X-Git-Tag: tests-5.3-2~52
X-Git-Url: http://git.onelab.eu/?p=tests.git;a=commitdiff_plain;h=567d6e70500cf677acd5e0a5a4e2d5601d2f999e

fix changes to the build for vs/lxc
---

diff --git a/system/Substrate.py b/system/Substrate.py
index 932d579..139790a 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -411,7 +411,7 @@ class BuildVsBox (BuildBox):
 
     # 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.*\s+(?P<buildname>[^\s]+)\s*\Z")
+    matcher_building_vm=re.compile("\s*(?P<pid>[0-9]+).*initvm.*\s+(?P<buildname>[^\s]+)\s*\Z")
     def sense(self, options):
         print 'vb',
         pids=self.backquote_ssh(['pgrep','vbuild'],trash_err=True)
@@ -420,18 +420,18 @@ class BuildVsBox (BuildBox):
         ps_lines=self.backquote_ssh (command).split('\n')
         for line in ps_lines:
             if not line.strip() or line.find('PID')>=0: continue
-            m=BuildBox.matcher.match(line)
+            m=BuildVsBox.matcher.match(line)
             if m: 
                 date=time.strftime('%Y-%m-%d',time.localtime(time.time()))
                 buildname=m.group('buildname').replace('@DATE@',date)
                 self.add_build (buildname,m.group('pid'))
                 continue
-            m=BuildBox.matcher_building_vm.match(line)
+            m=BuildVsBox.matcher_building_vm.match(line)
             if m: 
                 # buildname is expansed here
                 self.add_build (buildname,m.group('pid'))
                 continue
-            header('BuildBox.sense: command %r returned line that failed to match'%command)
+            header('BuildVsBox.sense: command %r returned line that failed to match'%command)
             header(">>%s<<"%line)
 
 class BuildLxcBox (BuildBox):