Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

diff --cc python/pakfire/builder.py
index 5beccdc862bbfcb5c729eeda631cdf019d9d7d01,773ef02acd109319aedeb5639077f20784bc07e2..89500f473075aeee2dfaefa22754427017f829d6
--- 1/python/pakfire/builder.py
--- 2/python/pakfire/builder.py
+++ b/python/pakfire/builder.py
@@@ -382,13 -394,12 +396,12 @@@ class BuildEnviron(object)
                        util.rm(self.path)
  
        def cleanup(self):
 -              logging.debug("Cleaning environemnt.")
 +              self.log.debug("Cleaning environemnt.")
  
                # Remove the build directory and buildroot.
-               dirs = ("build", "result")
+               dirs = (self.build_dir, self.chrootPath("result"),)
  
                for d in dirs:
-                       d = self.chrootPath(d)
                        if not os.path.exists(d):
                                continue
  

diff --cc python/pakfire/constants.py
Simple merge

diff --cc python/pakfire/packages/make.py
Simple merge