From: Kito <kito@gentoo.org>
Date: Sat, 11 Mar 2006 20:42:33 +0000 (-0000)
Subject: merge with trunk -r 2851:2854
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4b38bef614a5562179d4800bc961438e44b69f1f;p=portage.git

merge with trunk -r 2851:2854

svn path=/main/branches/prefix/; revision=2855
---

diff --git a/pym/portage.py b/pym/portage.py
index 1a0e306de..a2bc94443 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2563,7 +2563,7 @@ def doebuild(myebuild,mydo,myroot,mysettings,debug=0,listonly=0,fetchonly=0,clea
 		# Should be ok again to set $T, as sandbox does not depend on it
 		# XXX Bug.  no way in hell this is valid for clean handling.
 		mysettings["T"]=mysettings["PORTAGE_BUILDDIR"]+"/temp"
-		if cleanup or mydo=="clean":
+		if cleanup:
 			if os.path.exists(mysettings["T"]):
 				shutil.rmtree(mysettings["T"])
 		if not os.path.exists(mysettings["T"]):
@@ -6108,7 +6108,7 @@ class dblink:
 		# Process ebuild logfiles
 		elog_process(self.mycpv, self.settings)
 		if "noclean" not in features:
-			doebuild(myebuild, "clean", root, self.settings, cleanup=cleanup, tree=self.treetype)
+			doebuild(myebuild, "clean", root, self.settings, tree=self.treetype)
 		return 0
 
 	def mergeme(self,srcroot,destroot,outfile,secondhand,stufftomerge,cfgfiledict,thismtime):