diff options
author | Fabian Groffen <grobian@gentoo.org> | 2009-09-05 10:25:30 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2009-09-05 10:25:30 +0000 |
commit | 3bbf51d00ad96e5927ce4d84712fe0e30fbd0212 (patch) | |
tree | 291941aa5d5a08eaf2b3729192a4dfe64da6a915 /pym/_emerge | |
parent | 2b68c711bc37fe45c940a498227f2c367335b659 (diff) | |
download | portage-3bbf51d00ad96e5927ce4d84712fe0e30fbd0212.tar.gz portage-3bbf51d00ad96e5927ce4d84712fe0e30fbd0212.tar.bz2 portage-3bbf51d00ad96e5927ce4d84712fe0e30fbd0212.zip |
consistently use CACHE_PATH with target_root, this commit needs a separate soon to be done commit of pym/portage/const.py to work correctly
svn path=/main/trunk/; revision=14188
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/BlockerCache.py | 2 | ||||
-rw-r--r-- | pym/_emerge/actions.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py index 7b797ebbd..2af47ca85 100644 --- a/pym/_emerge/BlockerCache.py +++ b/pym/_emerge/BlockerCache.py @@ -37,7 +37,7 @@ class BlockerCache(portage.cache.mappings.MutableMapping): self._vardb = vardb self._virtuals = vardb.settings.getvirtuals() self._cache_filename = os.path.join(myroot, - portage.CACHE_PATH.lstrip(os.path.sep), "vdb_blockers.pickle") + portage.CACHE_PATH, "vdb_blockers.pickle") self._cache_version = "1" self._cache_data = None self._modified = set() diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index c87665ed2..399ff1001 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2594,7 +2594,7 @@ def load_emerge_config(trees=None): settings = trees[myroot]["vartree"].settings break - mtimedbfile = os.path.join("/", portage.CACHE_PATH.lstrip(os.path.sep), "mtimedb") + mtimedbfile = os.path.join(os.path.sep, settings['ROOT'], portage.CACHE_PATH, "mtimedb") mtimedb = portage.MtimeDB(mtimedbfile) portage.output._init(config_root=settings['PORTAGE_CONFIGROOT']) return settings, trees, mtimedb |