@@ -73,8 +73,24 @@ class PackageBuilder(object):

         except Exception as e:

             self.logger.error(e)

             outputMap[threadName]=False

-        

+

+    def checkIfPackageIsAlreadyBuilt(self, package):

+        basePkg=constants.specData.getSpecName(package)

+        listRPMPackages=constants.specData.getRPMPackages(basePkg)

+        packageIsAlreadyBuilt=True

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

+        for pkg in listRPMPackages:

+            if pkgUtils.findRPMFileForGivenPackage(pkg) is None:

+                packageIsAlreadyBuilt=False

+                break

+        return packageIsAlreadyBuilt

+

     def buildPackage(self,package):

+        #do not build if RPM is already built

+        if self.checkIfPackageIsAlreadyBuilt(package):

+            self.logger.info("Skipping building the package:"+package)

+            return

+

         #should initialize a logger based on package name

         chrUtils = ChrootUtils(self.logName,self.logPath)

         chrootName="build-"+package

@@ -65,7 +65,7 @@ class PackageManager(object):

         self.logger.info("List of Already built packages")

         self.logger.info(listAvailablePackages)

         return listAvailablePackages

-    

+

     def calculateParams(self,listPackages):

         self.listThreads.clear()

         self.mapOutputThread.clear()

@@ -75,8 +75,18 @@ class PackageManager(object):

         self.mapPackageToCycle.clear()

         self.sortedPackageList=[]

-        self.listOfPackagesAlreadyBuilt = self.readAlreadyAvailablePackages()

-        

+        listOfPackagesAlreadyBuilt = []

+        listOfPackagesAlreadyBuilt = self.readAlreadyAvailablePackages()

+        self.listOfPackagesAlreadyBuilt = listOfPackagesAlreadyBuilt[:]

+        for pkg in listOfPackagesAlreadyBuilt:

+            listDependentRpmPackages = constants.specData.getRequiresAllForPackage(pkg)

+            needToRebuild = False

+            for dependentPkg in listDependentRpmPackages:

+                if dependentPkg not in self.listOfPackagesAlreadyBuilt:

+                    needToRebuild = True

+            if needToRebuild:

+                self.listOfPackagesAlreadyBuilt.remove(pkg)

+ 

         listPackagesToBuild=listPackages[:]

         for pkg in listPackages:

             if pkg in self.listOfPackagesAlreadyBuilt:

@@ -6,6 +6,7 @@ from distutils.version import StrictVersion

 class SerializableSpecObject(object):

     def __init__(self):

         self.listPackages=[]

+        self.listRPMPackages=[]

         self.name=""

         self.version=""

         self.release=""

@@ -52,6 +53,8 @@ class SerializableSpecObjectsUtils(object):

 			break;			

             	specObj.installRequiresPackages[specPkg]=spec.getRequires(specPkg)

             	self.mapPackageToSpec[specPkg]=specName

+                if spec.getIsRPMPackage(specPkg):

+                    specObj.listRPMPackages.append(specPkg)

 	    if skipUpdating == False:

                 self.mapSerializableSpecObjects[specName]=specObj

@@ -105,6 +108,10 @@ class SerializableSpecObjectsUtils(object):

         specName=self.getSpecName(package)

         return self.mapSerializableSpecObjects[specName].listPackages

+    def getRPMPackages(self, package):

+        specName=self.getSpecName(package)

+        return self.mapSerializableSpecObjects[specName].listRPMPackages

+

     def getReleaseNum(self, releaseVal):

 	id = releaseVal.find(".")

 	if (id != -1):

@@ -19,18 +19,20 @@ class SpecParser(object):

         data=" ".join(data.split())

         pkgHeaderName=data.split(" ")

         lenpkgHeaderName = len(pkgHeaderName)

-        

-        if (lenpkgHeaderName >= 3 and pkgHeaderName[1] != "-n"):

-            lenpkgHeaderName = 1

-        if (lenpkgHeaderName == 2 or lenpkgHeaderName == 1 ) and basePkgName is None :

-            print "Invalid basePkgName"

-            return False,None

-        if lenpkgHeaderName == 3 :

-            return True,pkgHeaderName[2]

-        if lenpkgHeaderName == 2 :

-            return True,basePkgName + "-"+pkgHeaderName[1]

-        if lenpkgHeaderName == 1:

+        i=1;

+        pkgName = None

+        while i<lenpkgHeaderName:

+            if pkgHeaderName[i] == "-n" and i+1 < lenpkgHeaderName:

+                pkgName = pkgHeaderName[i+1]

+                break

+            if pkgHeaderName[i].startswith('-'):

+                i = i + 2

+            else:

+                pkgName = basePkgName+"-"+pkgHeaderName[i]

+                break

+        if pkgName is None:

             return True, basePkgName

+        return True, pkgName

     def parseSpecFile(self,specfile):

         self.createDefaultPackage()

@@ -58,9 +60,10 @@ class SpecParser(object):

                 else:

                     if defaultpkg.name == packageName :

                         packageName = 'default'

-                    if not self.packages.has_key(packageName):

-                        return False

                     macro,i=self.readMacroFromFile(i, lines)

+                    if not self.packages.has_key(packageName):

+                        i=i+1

+                        continue

                     self.packages[packageName].updatePackageMacro(macro)

             elif self.isPackageHeaders(line):

                 self.readPackageHeaders(line, self.packages[currentPkg])

@@ -63,6 +63,16 @@ class Specutils(object):

             packageNames.append(pkg.name)

         return packageNames

+    def getIsRPMPackage(self,pkgName):

+        defaultPkgName=self.spec.packages['default'].name

+        if pkgName == defaultPkgName:

+            pkgName = "default"

+        if pkgName in self.spec.packages.keys():

+            pkg = self.spec.packages.get(pkgName)

+            if pkg.filesMacro is not None:

+                return True

+        return False

+

     def getRPMNames(self):

         rpmNames=[]

         for key in self.spec.packages.keys():