jhbuild r2262 - in trunk: . jhbuild/buildbot/status/web

[fpeters svn gnome org]

Author: fpeters
Date: Sat Aug 16 15:55:25 2008
New Revision: 2262
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2262&view=rev

Log:
* jhbuild/buildbot/status/web/__init__.py: fixed slave header tooltip
to report all current builds, not just the first one.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/buildbot/status/web/__init__.py

Modified: trunk/jhbuild/buildbot/status/web/__init__.py
==============================================================================
--- trunk/jhbuild/buildbot/status/web/__init__.py	(original)
+++ trunk/jhbuild/buildbot/status/web/__init__.py	Sat Aug 16 15:55:25 2008
@@ -62,19 +62,26 @@
             for module in parent.modules:
                 builder = status.getBuilder("%s-%s" % (module, slave))
                 state, builds = builder.getState()
-                if state in ('offline', 'building'):
-                    slave_status[slave] = (state, module)
+                if state == 'offline':
+                    slave_status[slave] = ('offline', [])
                     break
+                elif state == 'building':
+                    if slave in slave_status:
+                        modules = slave_status[slave][1] or []
+                        slave_status[slave] = (state, modules + [module])
+                    else:
+                        slave_status[slave] = (state, [module])
             else:
-                slave_status[slave] = ('idle', None)
+                if not slave in slave_status:
+                    slave_status[slave] = ('idle', None)
 
         result += '<thead><tr><td>&nbsp;</td><td>&nbsp;</td><th>' + parent.moduleset + '</td>'
         for name in parent.slaves:
             if len(name) > 25:
                 name = name[:25] + '(...)'
-            klass, module = slave_status.get(name)
+            klass, modules = slave_status.get(name)
             if klass == 'building':
-                title = 'Building %s' % module
+                title = 'Building %s' % ', '.join(modules)
             else:
                 title = klass
             result += '<th class="%s" title="%s">%s</th>' % (klass, title, name)