merge with trunk -r 2851:2854

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

diff --git a/pym/portage.py b/pym/portage.py
index 1a0e306def946f50728ec395e34416e8ee93edda..a2bc94443d4f35d20cdeeb5a0939d535c1a32c3f 100644 (file)
--- 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):