From 7567b93a44dbdeb51a999e55500d5006fc0bb41b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 5 Apr 2006 18:58:40 +0000 Subject: Revert FEATURES=noclean behavior so that clean is only skipped after merge. Thanks to azarah for reporting. svn path=/main/trunk/; revision=3077 --- pym/portage.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 484738834..41f73407a 100644 --- 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): -- cgit v1.2.3-1-g7c22