extras-buildsys/server Builder.py,1.45,1.46

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Mon Jan 7 17:13:18 UTC 2008


Author: mschwendt

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

Modified Files:
	Builder.py 
Log Message:



Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Builder.py	29 May 2006 20:46:22 -0000	1.45
+++ Builder.py	7 Jan 2008 17:13:16 -0000	1.46
@@ -565,7 +565,7 @@
                 self._handle_job_files_ack(cmd)
                 handled = True
             elif isinstance(cmd, Commands.PlgCommandTargets):
-                if not self._target_list:
+                if not len(self._target_list):
                     self._target_list = cmd.targets()
                     self._upload_url = cmd.upload_url()
                 handled = True
@@ -610,7 +610,7 @@
     def _handle_builder_suspend(self, reason, msg):
         Builder._handle_builder_suspend(self, reason, msg)
         self._ping_interval = self._BUILDER_UNAVAIL_PING_INTERVAL
-        self._target_list = None
+        self._target_list = []
 
     def _handle_builder_reactivate(self):
         mail = True
@@ -710,7 +710,7 @@
                 self._handle_job_files_ack(cmd)
                 handled = True
             elif isinstance(cmd, Commands.PlgCommandTargets):
-                if not self._target_list:
+                if not len(self._target_list):
                     self._lock.acquire()
                     self._target_list = cmd.targets()
                     self._lock.release()
@@ -787,7 +787,7 @@
     def _handle_builder_reactivate(self, cmd_list):
         # Grab an updated target list from the command stream when
         # the builder contacts us
-        target_list = None
+        target_list = []
         for cmd in cmd_list:
             if isinstance(cmd, Commands.PlgCommandTargets):
                 target_list = cmd.targets()
@@ -799,7 +799,7 @@
                     cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next())
                     self._cmd_queue.append(cmd)
                     
-        if not target_list:
+        if not len(target_list):
             target_list = self._target_list
 
         mail = True




More information about the fedora-extras-commits mailing list