@@ -7,14 +7,13 @@ from Queue import PriorityQueue

 from SpecData import SPECS

 class Scheduler(object):

-

+    

     lock=threading.Lock()

     listOfAlreadyBuiltPackages=[]

     listOfPackagesToBuild=[]

     listOfPackagesCurrentlyBuilding=[]

     sortedList=[]

-    listOfPackagesNextToBuild=[]

-    queueOfPackagesNextToBuild=PriorityQueue()

+    listOfPackagesNextToBuild=PriorityQueue()

     listOfFailedPackages=[]

     alldependencyGraph = {}

     dependencyGraph = {}

@@ -24,14 +23,14 @@ class Scheduler(object):

     logger=None

     event=None

     stopScheduling=False

-

+    

     @staticmethod

     def setEvent(event):

         Scheduler.event=event

-

+    

     @staticmethod

     def setLog(logName,logPath):

-        Scheduler.logger = Logger.getLogger(logName, logPath)

+        Scheduler.logger = Logger.getLogger(logName, logPath)    

     @staticmethod

     def getBuildRequiredPackages(package):

@@ -108,7 +107,12 @@ class Scheduler(object):

     @staticmethod

     def setPriorities():

-        Scheduler.parseWeights()

+	if constants.packageWeightsPath == None:

+            Scheduler.logger.info("Priority Scheduler disabled")

+            Scheduler.isPriorityScheduler = 0

+	else:

+	    Scheduler.parseWeights()

+

         for package in Scheduler.sortedList:

             Scheduler.dependencyGraph[package] = {}

             Scheduler.alldependencyGraph[package] = {}

@@ -129,41 +133,37 @@ class Scheduler(object):

         Scheduler.logger.info("set Priorities: Priority of all packages")

         Scheduler.logger.info(Scheduler.priorityMap)

+

     @staticmethod

     def setParams(sortedList,listOfAlreadyBuiltPackages):

-        if constants.packageWeightsPath == None:

-            Scheduler.logger.info("Priority Scheduler disabled")

-            Scheduler.isPriorityScheduler = 0

         Scheduler.sortedList=sortedList

         Scheduler.listOfAlreadyBuiltPackages=listOfAlreadyBuiltPackages

         for x in Scheduler.sortedList:

             if x not in Scheduler.listOfAlreadyBuiltPackages or x in constants.testForceRPMS:

                 Scheduler.listOfPackagesToBuild.append(x)

         Scheduler.listOfPackagesCurrentlyBuilding=[]

-        Scheduler.queueOfPackagesNextToBuild=[]

+        Scheduler.listOfPackagesNextToBuild=[]

         Scheduler.listOfFailedPackages=[]

-        if Scheduler.isPriorityScheduler == 1:

-            Scheduler.setPriorities()

-

+        Scheduler.setPriorities()

+        

     @staticmethod

     def getRequiredPackages(package):

         listRequiredRPMPackages=[]

         listRequiredRPMPackages.extend(SPECS.getData().getBuildRequiresForPackage(package))

         listRequiredRPMPackages.extend(SPECS.getData().getRequiresAllForPackage(package))

-

+        

         listRequiredPackages=[]

         for pkg in listRequiredRPMPackages:

             basePkg=SPECS.getData().getSpecName(pkg)

             if basePkg not in listRequiredPackages:

                 listRequiredPackages.append(basePkg)

-

+        

         return listRequiredPackages

-

+    

     @staticmethod

     def __getListNextPackagesReadyToBuild():

-        queueOfPackagesNextToBuild=PriorityQueue()

-        listOfPackagesNextToBuild=[]

+        listOfPackagesNextToBuild=PriorityQueue()

         Scheduler.logger.info("Checking for next possible packages to build")

         for pkg in Scheduler.listOfPackagesToBuild:

             if pkg in Scheduler.listOfPackagesCurrentlyBuilding:

@@ -178,13 +178,9 @@ class Scheduler(object):

                     Scheduler.logger.info(reqPkg+" is not available. So we cannot build "+ pkg +" at this moment.")

                     break

             if canBuild:

+                listOfPackagesNextToBuild.put((-Scheduler.priorityMap[pkg], pkg))

                 Scheduler.logger.info("Adding "+ pkg +" to the schedule list")

-                if Scheduler.isPriorityScheduler:

-                    queueOfPackagesNextToBuild.put((-Scheduler.priorityMap[pkg], pkg))

-                    return queueOfPackagesNextToBuild

-                else:

-                    listOfPackagesNextToBuild.append(pkg)

-                    return listOfPackagesNextToBuild

+        return listOfPackagesNextToBuild

     @staticmethod

     def getNextPackageToBuild():

@@ -200,75 +196,62 @@ class Scheduler(object):

             if Scheduler.event is not None:

                 Scheduler.event.set()

-        if 0 == Scheduler.isPriorityScheduler:

-            if Scheduler.listOfPackagesNextToBuild is None or len(Scheduler.listOfPackagesNextToBuild) == 0:

-                listOfPackagesNextToBuild=Scheduler.__getListNextPackagesReadyToBuild()

-                Scheduler.listOfPackagesNextToBuild=listOfPackagesNextToBuild

-

-            if Scheduler.listOfPackagesNextToBuild is None or len(Scheduler.listOfPackagesNextToBuild) == 0:

-                Scheduler.logger.info("Released scheduler lock")

-                Scheduler.lock.release()

-                return None

-

-            package=Scheduler.listOfPackagesNextToBuild.pop(0)

-

-            if len(Scheduler.listOfPackagesNextToBuild) > 0:

-                ThreadPool.ThreadPool.activateWorkerThreads(len(Scheduler.listOfPackagesNextToBuild))

-        else:

-            try:

-                if Scheduler.queueOfPackagesNextToBuild.qsize() == 0:

-                    queueOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

-                    Scheduler.queueOfPackagesNextToBuild = queueOfPackagesNextToBuild

-            except:

-                if len(Scheduler.queueOfPackagesNextToBuild) == 0:

-                    queueOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

-                    Scheduler.queueOfPackagesNextToBuild = queueOfPackagesNextToBuild

-

-            if Scheduler.queueOfPackagesNextToBuild:

-                 if Scheduler.queueOfPackagesNextToBuild.qsize() == 0:

-                     Scheduler.logger.info("Released scheduler lock")

-                     Scheduler.lock.release()

-                     return None

-

-                 packageTup=Scheduler.queueOfPackagesNextToBuild.get()

-

-                 if packageTup[0] == 0:

-                    queueOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

-                    Scheduler.queueOfPackagesNextToBuild = queueOfPackagesNextToBuild

-                    packageTup = Scheduler.queueOfPackagesNextToBuild.get()

-

-                 package = packageTup[1]

-                 Scheduler.logger.info("PackagesNextToBuild " + str(packageTup))

-                 if Scheduler.queueOfPackagesNextToBuild.qsize() > 0:

-                     ThreadPool.ThreadPool.activateWorkerThreads(Scheduler.queueOfPackagesNextToBuild.qsize())

+        try:

+            if Scheduler.listOfPackagesNextToBuild.qsize() == 0:

+                listOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

+                Scheduler.listOfPackagesNextToBuild = listOfPackagesNextToBuild

+        except:

+            if len(Scheduler.listOfPackagesNextToBuild) == 0:

+                listOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

+                Scheduler.listOfPackagesNextToBuild = listOfPackagesNextToBuild

+

+        if Scheduler.listOfPackagesNextToBuild.qsize() == 0:

+            Scheduler.logger.info("Released scheduler lock")

+            Scheduler.lock.release()

+            return None

+        packageTup=Scheduler.listOfPackagesNextToBuild.get()

+

+        if packageTup[0] == 0 and Scheduler.isPriorityScheduler == 1:

+            listOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

+            Scheduler.listOfPackagesNextToBuild = listOfPackagesNextToBuild

+	    if Scheduler.listOfPackagesNextToBuild.qsize() == 0:

+            	Scheduler.logger.info("Released scheduler lock")

+            	Scheduler.lock.release()

+            	return None

+            packageTup = Scheduler.listOfPackagesNextToBuild.get()

+

+        package = packageTup[1]

+        Scheduler.logger.info("PackagesNextToBuild " + str(packageTup))

+        if Scheduler.listOfPackagesNextToBuild.qsize() > 0:

+            ThreadPool.ThreadPool.activateWorkerThreads(Scheduler.listOfPackagesNextToBuild.qsize())

         Scheduler.logger.info("Released scheduler lock")

         Scheduler.lock.release()

         Scheduler.listOfPackagesCurrentlyBuilding.append(package)

         Scheduler.listOfPackagesToBuild.remove(package)

         return package

-

+    

     #can be synchronized TODO

     @staticmethod

     def notifyPackageBuildCompleted(package):

         if package in Scheduler.listOfPackagesCurrentlyBuilding:

             Scheduler.listOfPackagesCurrentlyBuilding.remove(package)

             Scheduler.listOfAlreadyBuiltPackages.append(package)

-

-

+    

+        

     #can be synchronized TODO

     @staticmethod

     def notifyPackageBuildFailed(package):

         if package in Scheduler.listOfPackagesCurrentlyBuilding:

             Scheduler.listOfPackagesCurrentlyBuilding.remove(package)

             Scheduler.listOfFailedPackages.append(package)

-

+                

     @staticmethod

     def isAllPackagesBuilt():

         if len(Scheduler.listOfPackagesToBuild) == 0 :

             return True

         return False

-

+    

     @staticmethod

     def isAnyPackagesFailedToBuild():

         if len(Scheduler.listOfFailedPackages) != 0: