From f8f1d8c4ffd6848297e810181707adf87e442bb6 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
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 +-
 pym/portage/_legacy_globals.py | 2 +-
 pym/portage/dbapi/bintree.py   | 2 +-
 pym/portage/glsa.py            | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'pym')

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
diff --git a/pym/portage/_legacy_globals.py b/pym/portage/_legacy_globals.py
index baabcc2e6..615591af3 100644
--- a/pym/portage/_legacy_globals.py
+++ b/pym/portage/_legacy_globals.py
@@ -16,7 +16,7 @@ def _get_legacy_global(name):
 		return getattr(portage, name)
 
 	elif name in ('mtimedb', 'mtimedbfile'):
-		portage.mtimedbfile = os.path.join(portage.root,
+		portage.mtimedbfile = os.path.join(portage.settings['EROOT'],
 			CACHE_PATH, "mtimedb")
 		constructed.add('mtimedbfile')
 		portage.mtimedb = portage.MtimeDB(portage.mtimedbfile)
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 8cb59255d..dca683ee2 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -731,7 +731,7 @@ class binarytree(object):
 			except ImportError:
 				from urlparse import urlparse
 			urldata = urlparse(base_url)
-			pkgindex_file = os.path.join(self.settings["ROOT"], CACHE_PATH, "binhost",
+			pkgindex_file = os.path.join(self.settings["EROOT"], CACHE_PATH, "binhost",
 				urldata[1] + urldata[2], "Packages")
 			pkgindex = self._new_pkgindex()
 			try:
diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py
index 9b599528f..b88a07662 100644
--- a/pym/portage/glsa.py
+++ b/pym/portage/glsa.py
@@ -36,7 +36,7 @@ def get_applied_glsas(settings):
 	@rtype:		list
 	@return:	list of glsa IDs
 	"""
-	return grabfile(os.path.join(os.sep, settings["ROOT"], CACHE_PATH, "glsa"))
+	return grabfile(os.path.join(os.sep, settings["EROOT"], CACHE_PATH, "glsa"))
 
 
 # TODO: use the textwrap module instead
@@ -666,7 +666,7 @@ class Glsa:
 		"""
 		if not self.isApplied():
 			checkfile = codecs.open(
-				_unicode_encode(os.path.join(os.sep, self.config["ROOT"],
+				_unicode_encode(os.path.join(os.sep, self.config["EROOT"],
 				CACHE_PATH, "glsa"),
 				encoding=_encodings['fs'], errors='strict'), 
 				mode='a+', encoding=_encodings['content'], errors='strict')
-- 
cgit v1.2.3-1-g7c22