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

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

diff --git a/pym/portage.py b/pym/portage.py
index f9ebc99995ddef70a0dbf695e5dd4e2effa51c18..f1ed48e278c03956e7ae68025df984ebc72c5abf 100644 (file)
--- 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)