[llvm-commits] [zorg] r125941 - in /zorg/trunk/llvmlab/llvmlab: ci/buildbot/statusclient.py ui/templates/dashboard.html

[Daniel Dunbar]

Author: ddunbar
Date: Fri Feb 18 10:45:12 2011
New Revision: 125941

URL: http://llvm.org/viewvc/llvm-project?rev=125941&view=rev
Log:
llvmlab.ci.buildbot.statusclient: Fix a possible crash accessing invalid
builders.

Modified:
    zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py
    zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html

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=125941&r1=125940&r2=125941&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:45:12 2011
@@ -243,6 +243,7 @@
             if times is None or len(times) != 2:
                 yield ('invalid_build', builder.name, id)
                 builder.active_builds.remove(id)
+                continue
 
             # Otherwise, just check to see if the build is done.
             if times[1] is not None:

Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125941&r1=125940&r2=125941&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:45:12 2011
@@ -354,7 +354,6 @@
 {# The div we use to include help popups. #}
 <div id="help_popup_holder" style="display: none;" class="popup">
   {% call close_popup_link("help") %}(close) {% endcall %}
-  <hr>
   <div id="help_popup"></div>
 </div>
 {# The iframe we use to load the help source. This is never actually
@@ -373,8 +372,7 @@
 {# The div we use to include timing popups. #}
 <div id="timing_popup_holder" style="display: none;" class="popup">
   {% call close_popup_link("timing") %}(close) {% endcall %}
-  <hr>
-  <div id="timing_popup">
+  <div id="timing_popup" class="popup_inner">
     <canvas id="timing_graph" width="400" height="300"></canvas>
     <div id="timing_popup_legend"></div>
   </div>