From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 5 Jul 2006 18:39:27 +0000 (-0000)
Subject: Use a cloned config instance for the depend phase in portdbapi.aux_get().  See bug... 
X-Git-Tag: v2.1.1~279
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd7334c158763b53c113534d840bd1918944a7cc;p=portage.git

Use a cloned config instance for the depend phase in portdbapi.aux_get().  See bug #132601.

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

diff --git a/pym/portage.py b/pym/portage.py
index f9ebc9999..f1ed48e27 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5041,10 +5041,6 @@ class portdbapi(dbapi):
 			else:
 				mydbkey = self.depcachedir+"/aux_db_key_temp"
 
-			# XXX: Part of the gvisible hack/fix to prevent deadlock
-			# XXX: through doebuild. Need to isolate this somehow...
-			self.mysettings.reset()
-
 			if self.lock_held:
 				raise "Lock is already held by me?"
 			self.lock_held = 1
@@ -5059,7 +5055,8 @@ class portdbapi(dbapi):
 					writemsg("Uncaught handled exception: %(exception)s\n" % {"exception":str(e)})
 					raise
 
-			myret = doebuild(myebuild, "depend", "/", self.mysettings,
+			ebuild_settings = config(clone=self.mysettings)
+			myret = doebuild(myebuild, "depend", "/", ebuild_settings,
 				dbkey=mydbkey, tree="porttree", mydbapi=self)
 			if myret:
 				portage_locks.unlockfile(mylock)