@@ -6,10 +6,17 @@ class CommandUtils(object):

         self.findBinary = "find"

     def findFile (self, filename, sourcePath):

-        process = subprocess.Popen([self.findBinary,  "-L", sourcePath,  "-name", filename, "-not", "-type", "d"],  stdout=subprocess.PIPE)

-        returnVal = process.wait()

-        if returnVal != 0:

-            return None

+        process = subprocess.Popen([self.findBinary, "-L", sourcePath, "-name", filename, "-not", "-type", "d"],  stdout=subprocess.PIPE)

+        # We don't check the return val here because find could return 1 but still be able to find

+        # the result. We shouldn't blindly return None without even checking the result.

+        # The reason we want to suppress this is because for built RPMs, we first copy it to

+        # the location with a random name and move it to the real name. find will complain our

+        # action and return 1.

+        # find's flag ignore_readdir_race can suppress this but it isn't working.

+        # https://bugs.centos.org/view.php?id=13685

+

+        #if returnVal != 0:

+        #    return None

         result=process.communicate()[0]

         if result is None:

             return None

@@ -27,7 +34,7 @@ class CommandUtils(object):

         if retval==0:

             return True

         return False

-    

+

     def runCommandInShell2(self,cmd,chrootCmd=None):

         if chrootCmd is not None:

             cmd = chrootCmd+" "+cmd

@@ -128,7 +128,7 @@ class PackageBuilderContainer(object):

             outputMap[threadName]=True

         except Exception as e:

             # TODO: self.logger might be None

-            self.base.logger.error(e)

+            self.base.logger.exception(e)

             outputMap[threadName]=False

             raise e

@@ -277,7 +277,7 @@ class PackageBuilderChroot(object):

             outputMap[threadName]=True

         except Exception as e:

             # TODO: self.logger might be None

-            self.base.logger.error(e)

+            self.base.logger.exception(e)

             outputMap[threadName]=False

             raise e

@@ -5,6 +5,8 @@ import platform

 import shutil

 from constants import constants

 import re

+import random

+import string

 from time import sleep

 import PullSources

 import json

@@ -60,11 +62,14 @@ class PackageUtils(object):

         cmdUtils = CommandUtils()

         rpmName=os.path.basename(rpmFile)

         rpmDestDir=self.getRPMDestDir(rpmName,destDir)

+        # shutil is not atomic. copy & move to ensure atomicity.

         rpmDestPath=rpmDestDir+"/"+rpmName

+        rpmDestPathTemp = rpmDestDir + "/." + ''.join([random.choice(string.ascii_letters + string.digits) for n in xrange(10)])

         if os.geteuid()==0:

             if not os.path.isdir(rpmDestDir):

                 cmdUtils.runCommandInShell("mkdir -p "+rpmDestDir)

-            shutil.copyfile(rpmFile,  rpmDestPath)

+            shutil.copyfile(rpmFile, rpmDestPathTemp)

+            shutil.move(rpmDestPathTemp, rpmDestPath)

         return rpmDestPath

     def installRPM(self,package,chrootID,noDeps=False,destLogPath=None):

@@ -183,8 +188,8 @@ class PackageUtils(object):

         chrootCmd=self.runInChrootCommand+" "+chrootID

         shutil.copyfile(specFile, chrootID+chrootSpecPath+specName )

-# FIXME: some sources are located in SPECS/.. how to mount?

-#        if os.geteuid()==0:

+        # FIXME: some sources are located in SPECS/.. how to mount?

+        #        if os.geteuid()==0:

         self.copySourcesTobuildroot(listSourcesFiles,package,chrootSourcePath)

         self.copySourcesTobuildroot(listPatchFiles,package,chrootSourcePath)