Revert FEATURES=noclean behavior so that clean is only skipped after merge. Thanks...

svn path=/main/trunk/; revision=3077

diff --git a/pym/portage.py b/pym/portage.py
index 48473883401c86e7f0740c1398f141f72bc11d7d..41f73407a84192080f39ce37cc67b99b59cc6c60 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2694,8 +2694,6 @@ def doebuild(myebuild,mydo,myroot,mysettings,debug=0,listonly=0,fetchonly=0,clea
 
        # if any of these are being called, handle them -- running them out of the sandbox -- and stop now.
        if mydo in ["clean","cleanrm"]:
-               if "noclean" in features:
-                       return 0
                return spawn(EBUILD_SH_BINARY+" clean",mysettings,debug=debug,free=1,logfile=None)
        elif mydo in ["help","setup"]:
                return spawn(EBUILD_SH_BINARY+" "+mydo,mysettings,debug=debug,free=1,logfile=logfile)
@@ -6044,7 +6042,8 @@ class dblink:
 
                # Process ebuild logfiles
                elog_process(self.mycpv, self.settings)
-               doebuild(myebuild, "clean", root, self.settings, tree=self.treetype)
+               if "noclean" not in self.settings.features:
+                       doebuild(myebuild, "clean", root, self.settings, tree=self.treetype)
                return 0
 
        def mergeme(self,srcroot,destroot,outfile,secondhand,stufftomerge,cfgfiledict,thismtime):