diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-04-05 18:58:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-04-05 18:58:40 +0000 |
| commit | 7567b93a44dbdeb51a999e55500d5006fc0bb41b (patch) | |
| tree | c9169673e47d3f99f6ab7e508d5e6dfd9e53f464 | |
| parent | aa4892ccf483cb8da8fe59a318ce9251fdac4d23 (diff) | |
| download | portage-7567b93a44dbdeb51a999e55500d5006fc0bb41b.tar.gz portage-7567b93a44dbdeb51a999e55500d5006fc0bb41b.tar.bz2 portage-7567b93a44dbdeb51a999e55500d5006fc0bb41b.zip | |
Revert FEATURES=noclean behavior so that clean is only skipped after merge. Thanks to azarah for reporting.
svn path=/main/trunk/; revision=3077
| -rw-r--r-- | pym/portage.py | 5 |
1 files 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): |