diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-05 18:39:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-05 18:39:27 +0000 |
| commit | cd7334c158763b53c113534d840bd1918944a7cc (patch) | |
| tree | 9cab0e727cf6beb5bca120bfb5345029ff8633ea | |
| parent | 0b05a2f3f07836bc358576921030850f4bd3eee6 (diff) | |
| download | portage-cd7334c158763b53c113534d840bd1918944a7cc.tar.gz portage-cd7334c158763b53c113534d840bd1918944a7cc.tar.bz2 portage-cd7334c158763b53c113534d840bd1918944a7cc.zip | |
Use a cloned config instance for the depend phase in portdbapi.aux_get(). See bug #132601.
svn path=/main/trunk/; revision=3791
| -rw-r--r-- | pym/portage.py | 7 |
1 files changed, 2 insertions, 5 deletions
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) |