From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 20 Nov 2011 10:23:58 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.18~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88b93a85890d4d06b57f17ce3cba7116ade88855;p=pakfire.git

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

88b93a85890d4d06b57f17ce3cba7116ade88855
diff --cc python/pakfire/builder.py
index 5beccdc86,773ef02ac..89500f473
--- a/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