diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-09-04 16:00:36 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-09-04 16:00:36 -0700 |
commit | 3f901a5c683fb90ef69c33c8e8f1a8f65853b43a (patch) | |
tree | b7d8816bb4d3f54306f142b0ca7304bab0fa706a /pym/_emerge/BlockerDB.py | |
parent | 208e905b68118621ea74999c1e1b589e7a83d203 (diff) | |
download | portage-3f901a5c683fb90ef69c33c8e8f1a8f65853b43a.tar.gz portage-3f901a5c683fb90ef69c33c8e8f1a8f65853b43a.tar.bz2 portage-3f901a5c683fb90ef69c33c8e8f1a8f65853b43a.zip |
Add a Scheduler._frozen_config attribute that will be useful for
dependency calculations related to aggressive parallelization
(bug #279623). The FakeVartree instances are shared with the
existing BlockerDB instances.
Diffstat (limited to 'pym/_emerge/BlockerDB.py')
-rw-r--r-- | pym/_emerge/BlockerDB.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index f671a58a7..53a48bf81 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -9,7 +9,6 @@ from portage import digraph from portage._sets.base import InternalPackageSet from _emerge.BlockerCache import BlockerCache -from _emerge.FakeVartree import FakeVartree from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice if sys.hexversion >= 0x3000000: @@ -17,23 +16,22 @@ if sys.hexversion >= 0x3000000: class BlockerDB(object): - def __init__(self, root_config): + def __init__(self, fake_vartree): + root_config = fake_vartree._root_config self._root_config = root_config self._vartree = root_config.trees["vartree"] self._portdb = root_config.trees["porttree"].dbapi self._dep_check_trees = None - self._fake_vartree = None + self._fake_vartree = fake_vartree + self._dep_check_trees = { + self._vartree.root : { + "porttree" : fake_vartree, + "vartree" : fake_vartree, + }} def _get_fake_vartree(self, acquire_lock=0): fake_vartree = self._fake_vartree - if fake_vartree is None: - fake_vartree = FakeVartree(self._root_config) - self._fake_vartree = fake_vartree - self._dep_check_trees = { self._vartree.root : { - "porttree" : fake_vartree, - "vartree" : fake_vartree, - }} fake_vartree.sync(acquire_lock=acquire_lock) return fake_vartree |