From f8f1d8c4ffd6848297e810181707adf87e442bb6 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 4 Sep 2010 19:57:53 +0200 Subject: use EROOT with CACHE_PATH --- pym/_emerge/BlockerCache.py | 3 ++- pym/_emerge/actions.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py index 9c5ff4245..5c4f43e52 100644 --- a/pym/_emerge/BlockerCache.py +++ b/pym/_emerge/BlockerCache.py @@ -37,8 +37,9 @@ class BlockerCache(portage.cache.mappings.MutableMapping): self.atoms = atoms def __init__(self, myroot, vardb): + """ myroot is ignored in favour of EROOT """ self._vardb = vardb - self._cache_filename = os.path.join(myroot, + self._cache_filename = os.path.join(vardb.settings['EROOT'], portage.CACHE_PATH, "vdb_blockers.pickle") self._cache_version = "1" self._cache_data = None diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 03ca784d6..5dc0cd598 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2790,7 +2790,7 @@ def load_emerge_config(trees=None): settings = trees[myroot]["vartree"].settings break - mtimedbfile = os.path.join(os.path.sep, settings['ROOT'], portage.CACHE_PATH, "mtimedb") + mtimedbfile = os.path.join(os.path.sep, settings['EROOT'], portage.CACHE_PATH, "mtimedb") mtimedb = portage.MtimeDB(mtimedbfile) portage.output._init(config_root=settings['PORTAGE_CONFIGROOT']) QueryCommand._db = trees -- cgit v1.2.3-1-g7c22