[llvm-commits] [zorg] r125927 - in /zorg/trunk/llvmlab/llvmlab/ci: buildbot/statusclient.py status.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Feb 18 10:44:13 2011
New Revision: 125927

URL: http://llvm.org/viewvc/llvm-project?rev=125927&view=rev
Log:
llvmlab: Fix some buildbot monitoring bugs exposed by builder renames.

Modified:
    zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py
    zorg/trunk/llvmlab/llvmlab/ci/status.py

Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125927&r1=125926&r2=125927&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:44:13 2011
@@ -133,7 +133,7 @@
             self.builders[name] = BuilderInfo(name)
         for name in current_builders - builder_names:
             yield ('removed_builder', name)
-            self.builders.remove(name)
+            self.builders.pop(name)
 
         self.last_builders_poll = time.time()
 

Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125927&r1=125926&r2=125927&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ci/status.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:44:13 2011
@@ -58,8 +58,9 @@
                         self.status.build_map[name] = {}
                 elif kind == 'removed_builder':
                     name = event[1]
-                    self.status.builders.pop(name)
-                    self.status.build_map.pop(name)
+                    if name in self.status.builders:
+                        self.status.builders.pop(name)
+                        self.status.build_map.pop(name)
                 elif kind == 'reset_builder':
                     name = event[1]
                     self.status.builders[name] = []