@@ -9,7 +9,7 @@ import traceback

 import shutil

 class ToolChainUtils(object):

-    

+

     def __init__(self,logName=None,logPath=None):

         if logName is None:

             logName = "Toolchain Utils"

@@ -45,7 +45,7 @@ class ToolChainUtils(object):

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/LOGS")

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/BUILD")

         cmdUtils.runCommandInShell("mkdir -p "+chrootID+constants.topDirPath+"/BUILDROOT")

-        

+

         prepareChrootCmd=self.prepareBuildRootCmd+" "+chrootID

         logFile=constants.logPath+"/prepareBuildRoot.log"

         returnVal=cmdUtils.runCommandInShell(prepareChrootCmd,logFile)

@@ -72,7 +72,7 @@ class ToolChainUtils(object):

         if len(listFilterRPMFiles) > 1 :

             self.logger.error("Found multiple rpm files for given package in rpm directory.Unable to determine the rpm file for package:"+package)

             return None

-    

+

     def buildCoreToolChainPackages(self, listBuildOptionPackages, pkgBuildOptionFile):

         self.logger.info("Building core tool chain packages.....")

         chrootID=None

@@ -105,7 +105,7 @@ class ToolChainUtils(object):

             # print stacktrace

             traceback.print_exc()

             raise e

-                

+

     def installToolChainRPMS(self,chrootID, packageName):

         cmdUtils = CommandUtils()

         self.prepareBuildRoot(chrootID)

@@ -114,7 +114,10 @@ class ToolChainUtils(object):

         packages = ""

         for package in constants.listToolChainRPMsToInstall:

             pkgUtils=PackageUtils(self.logName,self.logPath)

-            rpmFile=pkgUtils.findRPMFileForGivenPackage(package)

+            rpmFile = None

+            if (packageName not in constants.listToolChainRPMsToInstall or

+                    constants.listToolChainRPMsToInstall.index(packageName) > constants.listToolChainRPMsToInstall.index(package)):

+                rpmFile=pkgUtils.findRPMFileForGivenPackage(package)

             if rpmFile is None:

                 # sqlite-autoconf package was renamed, but it still published as sqlite-autoconf

                 if package == "sqlite":

@@ -138,7 +141,7 @@ class ToolChainUtils(object):

             raise Exception("RPM installation failed")

         self.logger.info("Successfully installed default Tool Chain RPMS in Chroot:"+chrootID)

         print "Building Package:"+ packageName

-	print constants.perPackageToolChain

+        print constants.perPackageToolChain

         if packageName in constants.perPackageToolChain:

             print constants.perPackageToolChain[packageName]

             self.installCustomToolChainRPMS(chrootID, constants.perPackageToolChain[packageName], packageName);

@@ -149,7 +152,7 @@ class ToolChainUtils(object):

         packages = ""

         for package in listOfToolChainPkgs:

             pkgUtils=PackageUtils(self.logName,self.logPath)

-	    print "DEBUG:" + package

+            print "DEBUG:" + package

             if "openjre8" in packageName or "openjdk8" in packageName:

                 rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishXRPMRepo)

             else:

@@ -161,8 +164,8 @@ class ToolChainUtils(object):

             packages += " " + package

         self.logger.debug("Installing rpms:"+packages)

-	cmd=self.rpmCommand + " -i --nodeps --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles

-	print "Command Executed:" + cmd 

+        cmd=self.rpmCommand + " -i --nodeps --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles

+        print "Command Executed:" + cmd

         process = subprocess.Popen("%s" %cmd,shell=True,stdout=subprocess.PIPE)

         retval = process.wait()

         if retval != 0: