diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-03-14 07:00:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-03-14 07:00:25 +0000 |
| commit | d0fa70a4875fcda4c4870bd0349d32746b43d6db (patch) | |
| tree | c394cf18fe9bc8471dc14d4ccccf133c1e5d3609 /pym | |
| parent | b73287728f234dc79024deb073a6f3fcd90ca42e (diff) | |
| download | portage-d0fa70a4875fcda4c4870bd0349d32746b43d6db.tar.gz portage-d0fa70a4875fcda4c4870bd0349d32746b43d6db.tar.bz2 portage-d0fa70a4875fcda4c4870bd0349d32746b43d6db.zip | |
Move the "noclean" feature check into clean phase part of doebuild.
svn path=/main/trunk/; revision=2879
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py index 94e626279..fa7be3660 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2722,6 +2722,8 @@ 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) @@ -5838,8 +5840,7 @@ class dblink: if a != 0: writemsg("!!! FAILED postrm: "+str(a)+"\n") sys.exit(123) - if "noclean" not in features: - doebuild(myebuildpath, "cleanrm", self.myroot, self.settings, tree=self.treetype) + doebuild(myebuildpath, "cleanrm", self.myroot, self.settings, tree=self.treetype) self.unlockdb() def isowner(self,filename,destroot): @@ -6077,8 +6078,7 @@ class dblink: # Process ebuild logfiles elog_process(self.mycpv, self.settings) - if "noclean" not in features: - doebuild(myebuild, "clean", root, self.settings, tree=self.treetype) + doebuild(myebuild, "clean", root, self.settings, tree=self.treetype) return 0 def mergeme(self,srcroot,destroot,outfile,secondhand,stufftomerge,cfgfiledict,thismtime): |