From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 24 Apr 2006 20:58:08 +0000 (-0000)
Subject: Use tree="vartree" for prerm, postrm, and cleanrm phases (see bug #131116).
X-Git-Tag: v2.1_pre10~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef4d6904724923cfe1ddde827ba668ff3fce30b5;p=portage.git

Use tree="vartree" for prerm, postrm, and cleanrm phases (see bug #131116).

svn path=/main/trunk/; revision=3214
---

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):