summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-24 20:58:08 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-24 20:58:08 +0000
commitef4d6904724923cfe1ddde827ba668ff3fce30b5 (patch)
treeb849da0e37adcb3b495cf54826a0b864771ac3a6
parent2bce94811eb6ce4ce255af533fe33f2f08ed1cec (diff)
downloadportage-ef4d6904724923cfe1ddde827ba668ff3fce30b5.tar.gz
portage-ef4d6904724923cfe1ddde827ba668ff3fce30b5.tar.bz2
portage-ef4d6904724923cfe1ddde827ba668ff3fce30b5.zip
Use tree="vartree" for prerm, postrm, and cleanrm phases (see bug #131116).
svn path=/main/trunk/; revision=3214
-rw-r--r--pym/portage.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 7d780aeb3..892522d3a 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5536,7 +5536,8 @@ class dblink:
#do prerm script
if myebuildpath and os.path.exists(myebuildpath):
# Eventually, we'd like to pass in the saved ebuild env here...
- a=doebuild(myebuildpath,"prerm",self.myroot,self.settings,cleanup=cleanup,use_cache=0,tree=self.treetype)
+ a = doebuild(myebuildpath, "prerm", self.myroot, self.settings,
+ cleanup=cleanup, use_cache=0, tree="vartree")
# XXX: Decide how to handle failures here.
if a != 0:
writemsg("!!! FAILED prerm: "+str(a)+"\n")
@@ -5696,12 +5697,13 @@ class dblink:
if myebuildpath and os.path.exists(myebuildpath):
# XXX: This should be the old config, not the current one.
# XXX: Use vardbapi to load up env vars.
- a=doebuild(myebuildpath,"postrm",self.myroot,self.settings,use_cache=0,tree=self.treetype)
+ a = doebuild(myebuildpath, "postrm", self.myroot, self.settings,
+ use_cache=0, tree="vartree")
# XXX: Decide how to handle failures here.
if a != 0:
writemsg("!!! FAILED postrm: "+str(a)+"\n")
sys.exit(123)
- doebuild(myebuildpath, "cleanrm", self.myroot, self.settings, tree=self.treetype)
+ doebuild(myebuildpath, "cleanrm", self.myroot, self.settings, tree="vartree")
self.unlockdb()
def isowner(self,filename,destroot):