@@ -12,7 +12,7 @@ import docker

 class PackageBuilderBase(object):

     def __init__(self, mapPackageToCycles, listAvailableCyclicPackages,

                  listBuildOptionPackages, pkgBuildOptionFile, pkgBuildType):

-        # will be initialized in buildPackageThreadAPI()

+        # will be initialized in buildPackageFunction()

         self.logName = None

         self.logPath = None

         self.logger = None

@@ -26,7 +26,7 @@ class PackageBuilderBase(object):

         self.pkgBuildOptionFile = pkgBuildOptionFile

         self.pkgBuildType = pkgBuildType

-    def buildPackageThreadAPIPrepare(self, package, outputMap, threadName):

+    def buildPackagePrepareFunction(self, package, outputMap, threadName):

         self.package = package

         self.logName = "build-" + package

         self.logPath = constants.logPath + "/build-" + package

@@ -130,8 +130,8 @@ class PackageBuilderContainer(object):

         self.base = PackageBuilderBase(mapPackageToCycles, listAvailableCyclicPackages,

                                        listBuildOptionPackages, pkgBuildOptionFile, pkgBuildType)

-    def buildPackageThreadAPI(self, package, outputMap, threadName):

-        self.base.buildPackageThreadAPIPrepare(package, outputMap, threadName)

+    def buildPackageFunction(self, package, outputMap, threadName):

+        self.base.buildPackagePrepareFunction(package, outputMap, threadName)

         try:

             self.buildPackage()

             outputMap[threadName] = True

@@ -298,8 +298,8 @@ class PackageBuilderChroot(object):

         self.base = PackageBuilderBase(mapPackageToCycles, listAvailableCyclicPackages,

                                        listBuildOptionPackages, pkgBuildOptionFile, pkgBuildType)

-    def buildPackageThreadAPI(self, package, outputMap, threadName):

-        self.base.buildPackageThreadAPIPrepare(package, outputMap, threadName)

+    def buildPackageFunction(self, package, outputMap, threadName):

+        self.base.buildPackagePrepareFunction(package, outputMap, threadName)

         try:

             self.buildPackage()

             outputMap[threadName] = True

@@ -184,52 +184,45 @@ class Scheduler(object):

     @staticmethod

     def getNextPackageToBuild():

         Scheduler.logger.info("Waiting to acquire scheduler lock")

-        Scheduler.lock.acquire()

+        with Scheduler.lock:

-        if Scheduler.stopScheduling:

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

-            Scheduler.lock.release()

-            return None

-

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

-            if Scheduler.event is not None:

-                Scheduler.event.set()

-

-        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.stopScheduling:

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

+                return None

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

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

-            Scheduler.lock.release()

-            return None

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

+                if Scheduler.event is not None:

+                    Scheduler.event.set()

-        packageTup = Scheduler.listOfPackagesNextToBuild.get()

+            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 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

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

+                listOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

+                Scheduler.listOfPackagesNextToBuild = listOfPackagesNextToBuild

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

+                    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.listOfPackagesCurrentlyBuilding.append(package)

+            Scheduler.listOfPackagesToBuild.remove(package)

+            return package

     #can be synchronized TODO

     @staticmethod

@@ -40,10 +40,7 @@ class WorkerThread(threading.Thread):

                                                      self.listBuildOptionPackages,

                                                      self.pkgBuildOptionFile,

                                                      self.pkgBuildType)

-            t = threading.Thread(target=pkgBuilder.buildPackageThreadAPI,

-                                 args=(pkg, outputMap, pkg))

-            t.start()

-            t.join()

+            pkgBuilder.buildPackageFunction(pkg, outputMap, pkg)

             if pkg not in outputMap or outputMap[pkg] == False:

                 buildThreadFailed = True

                 Scheduler.Scheduler.notifyPackageBuildFailed(pkg)