[Uludag-commits] r11973 - repos/buildfarm

[svn-uludag at uludag.org.tr]

Author: caglar
Date: Sun Jan 14 18:03:21 2007
New Revision: 11973

Added:
   repos/buildfarm/
      - copied from r11970, trunk/buildfarm/
Modified:
   repos/buildfarm/qmanager.py
Log:
buildfarm branched for xmlrpc work

Modified: repos/buildfarm/qmanager.py
=================================================================
--- trunk/buildfarm/qmanager.py	(original)
+++ repos/buildfarm/qmanager.py	Sun Jan 14 18:03:21 2007
@@ -9,7 +9,6 @@
 # (at your option) any later version.
 #
 # Please read the COPYING file.
-#
 
 """ Standart Python Modules """
 import os
@@ -18,16 +17,13 @@
 import config
 import dependency
 
-class QError(Exception):
-    pass
-
 class QueueManager:
     def __init__(self):
         self.workQueue = []
         self.waitQueue = []
 
-        self.__deserialize(self.workQueue, "workQueue")
-        self.__deserialize(self.waitQueue, "waitQueue")
+        self.__deserialize__(self.workQueue, "workQueue")
+        self.__deserialize__(self.waitQueue, "waitQueue")
 
         if len(self.waitQueue):
             self.workQueue += self.waitQueue
@@ -38,10 +34,10 @@
         self.workQueue = dependency.DependencyResolver(self.workQueue).resolvDeps()
 
     def __del__(self):
-        self.__serialize(self.waitQueue, "waitQueue")
-        self.__serialize(self.workQueue, "workQueue")
+        self.__serialize__(self.waitQueue, "waitQueue")
+        self.__serialize__(self.workQueue, "workQueue")
 
-    def __serialize(self, queueName, fileName):
+    def __serialize__(self, queueName, fileName):
         try:
             queue = open(os.path.join(config.workDir, fileName), "w")
         except IOError:
@@ -51,7 +47,7 @@
             queue.write("%s\n" % pspec)
         queue.close()
 
-    def __deserialize(self, queueName, fileName):
+    def __deserialize__(self, queueName, fileName):
         try:
             queue = open(os.path.join(config.workDir, fileName), "r")
         except IOError:
@@ -62,28 +58,48 @@
                 queueName.append(line.strip("\n"))
         queue.close()
 
+    def getWorkQueue(self):
+        return self.workQueue
+
+    def getWaitQueue(self):
+        return self.waitQueue
+
     def removeFromWaitQueue(self):
         if self.waitQueue.__contains__(pspec):
             self.waitQueue.remove(pspec)
+            self.__serialize__(self.waitQueue, "waitQueue")
+            return True
+        return False
 
     def removeFromWorkQueue(self, pspec):
         if self.workQueue.__contains__(pspec):
             self.workQueue.remove(pspec)
+            self.__serialize__(self.workQueue, "workQueue")
+            return True
+        return False
 
     def appendToWorkQueue(self, pspec):
          if not self.workQueue.__contains__(pspec):
             self.workQueue.append(pspec)
-            self.__serialize(self.workQueue, "workQueue")
+            self.__serialize__(self.workQueue, "workQueue")
+            return True
+         return False
 
     def appendToWaitQueue(self, pspec):
          if not self.waitQueue.__contains__(pspec):
             self.waitQueue.append(pspec)
-            self.__serialize(self.waitQueue, "waitQueue")
+            self.__serialize__(self.waitQueue, "waitQueue")
+            return True
+         return False
 
     def transferToWorkQueue(self, pspec):
-        self.appendToWorkQueue(pspec)
-        self.removeFromWaitQueue(pspec)
+        if self.appendToWorkQueue(pspec):
+            self.removeFromWaitQueue(pspec)
+            return True
+        return False
 
     def transferToWaitQueue(self, pspec):
-        self.appendToWaitQueue(pspec)
-        self.removeFromWorkQueue(pspec)
+        if self.appendToWaitQueue(pspec):
+            self.removeFromWorkQueue(pspec)
+            return True
+        return False