simpler yet

diff --git a/system/Substrate.py b/system/Substrate.py
index ad50129..7fe0019 100644 (file)
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -303,7 +303,6 @@ class BuildBox (Box):
         return '*undef* uptime'
 
     # inspect box and find currently running builds
-    matcher_exclude=re.compile(".*builds\.sh.*")
     matcher=re.compile("\s*(?P<pid>[0-9]+).*-[bo]\s+(?P<buildname>[^\s]+)(\s|\Z)")
     def sense(self,reboot=False,verbose=True):
         if reboot:
@@ -313,13 +312,12 @@ class BuildBox (Box):
         command=['uptime']
         self._uptime=self.backquote_ssh(command,trash_err=True).strip()
         if not self._uptime: self._uptime='unreachable'
-        pids=self.backquote_ssh(['pgrep','build'],trash_err=True)
+        pids=self.backquote_ssh(['pgrep','vbuild'],trash_err=True)
         if not pids: return
         command=['ps','-o','pid,command'] + [ pid for pid in pids.split("\n") if pid]
         ps_lines=self.backquote_ssh (command).split('\n')
         for line in ps_lines:
             if not line.strip() or line.find('PID')>=0: continue
-            if BuildBox.matcher_exclude.match(line): continue
             m=BuildBox.matcher.match(line)
             if m: 
                 date=time.strftime('%Y-%m-%d',time.localtime(time.time()))