extras-buildsys/server Builder.py, 1.7, 1.8 BuilderManager.py, 1.6, 1.7

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20066/server

Modified Files:
	Builder.py BuilderManager.py 
Log Message:
Return unavailable builders in the builder list


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Builder.py	16 Jul 2005 15:47:43 -0000	1.7
+++ Builder.py	20 Jul 2005 20:50:07 -0000	1.8
@@ -210,17 +210,17 @@
         return self._prepping_jobs
 
     def to_dict(self):
-        client_dict = {}
-        client_dict['address'] = self._address
+        builder_dict = {}
+        builder_dict['address'] = self._address
         arches = []
         for target in self._target_arches.keys():
             for arch in self._target_arches[target]:
                 if not arch in arches:
                     arches.append(arch)
-        client_dict['arches'] = arches
+        builder_dict['arches'] = arches
         if self._cur_jobid:
-            client_dict['status'] = 'building'
+            builder_dict['status'] = 'building'
         else:
-            client_dict['status'] = 'idle'
-        return client_dict
+            builder_dict['status'] = 'idle'
+        return builder_dict
 


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BuilderManager.py	18 Jul 2005 19:07:48 -0000	1.6
+++ BuilderManager.py	20 Jul 2005 20:50:07 -0000	1.7
@@ -111,6 +111,21 @@
         builder_list = []
         for builder in self.running_builders:
             builder_list.append(builder.to_dict())
+
+        # Add unavailable builders
+        for builder in self.possible_builders:
+            found = False
+            for tmp in builder_list:
+                if builder == tmp['address']:
+                    found = True
+            if found:
+                continue
+            builder_dict = {}
+            builder_dict['address'] = builder
+            builder_dict['arches'] = []
+            builder_dict['status'] = "unavailable"
+            builder_list.append(builder_dict)
+
         return builder_list
 
     def have_work(self):