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

6 files changed, 14 insertions, 14 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
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c9ae08f44..4b79d6802 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2198,12 +2198,12 @@ class config(object):
 		if not os.access(self["ROOT"], os.W_OK):
 			return
 
-		#                                     gid, mode, mask, preserve_perms
+		#                                gid, mode, mask, preserve_perms
 		dir_mode_map = {
-			"tmp"             : (                      -1, 01777,  0,  True),
-			"var/tmp"         : (                      -1, 01777,  0,  True),
-			PRIVATE_PATH      : (             portage_gid, 02750, 02,  False),
-			CACHE_PATH.lstrip(os.path.sep) : (portage_gid,  0755, 02,  False)
+			"tmp"             : (         -1, 01777,  0,  True),
+			"var/tmp"         : (         -1, 01777,  0,  True),
+			PRIVATE_PATH      : (portage_gid, 02750, 02,  False),
+			CACHE_PATH        : (portage_gid,  0755, 02,  False)
 		}
 
 		for mypath, (gid, mode, modemask, preserve_perms) \
@@ -8811,8 +8811,8 @@ class _MtimedbProxy(proxy.objectproxy.ObjectProxy):
 	def _get_target(self):
 		global mtimedb, mtimedbfile, _mtimedb_initialized
 		if not _mtimedb_initialized:
-			mtimedbfile = os.path.join("/",
-				CACHE_PATH.lstrip(os.path.sep), "mtimedb")
+			mtimedbfile = os.path.join(os.path.sep,
+				CACHE_PATH, "mtimedb")
 			mtimedb = MtimeDB(mtimedbfile)
 			_mtimedb_initialized = True
 		name = object.__getattribute__(self, '_name')
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index f40583e0b..a3b1236b9 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -660,7 +660,7 @@ class binarytree(object):
 			from portage.const import CACHE_PATH
 			from urlparse import urlparse
 			urldata = urlparse(base_url)
-			pkgindex_file = os.path.join(CACHE_PATH, "binhost",
+			pkgindex_file = os.path.join(self.settings["ROOT"], CACHE_PATH, "binhost",
 				urldata[1] + urldata[2], "Packages")
 			pkgindex = self._new_pkgindex()
 			try:
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 23710cd2e..15ec5b798 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -814,9 +814,9 @@ class vardbapi(dbapi):
 			"repository", "RESTRICT" , "SLOT", "USE"])
 		self._aux_cache_obj = None
 		self._aux_cache_filename = os.path.join(self.root,
-			CACHE_PATH.lstrip(os.path.sep), "vdb_metadata.pickle")
+			CACHE_PATH, "vdb_metadata.pickle")
 		self._counter_path = os.path.join(root,
-			CACHE_PATH.lstrip(os.path.sep), "counter")
+			CACHE_PATH, "counter")
 
 		try:
 			self.plib_registry = PreservedLibsRegistry(self.root,
diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py
index db297995d..6dc73ac67 100644
--- a/pym/portage/glsa.py
+++ b/pym/portage/glsa.py
@@ -33,7 +33,7 @@ def get_applied_glsas(settings):
 	@rtype:		list
 	@return:	list of glsa IDs
 	"""
-	return grabfile(os.path.join(os.sep, settings["ROOT"], CACHE_PATH.lstrip(os.sep), "glsa"))
+	return grabfile(os.path.join(os.sep, settings["ROOT"], CACHE_PATH, "glsa"))
 
 
 # TODO: use the textwrap module instead
@@ -655,7 +655,7 @@ class Glsa:
 		if not self.isApplied():
 			checkfile = codecs.open(
 				_unicode_encode(os.path.join(os.sep, self.config["ROOT"],
-				CACHE_PATH.lstrip(os.sep), "glsa"),
+				CACHE_PATH, "glsa"),
 				encoding=_encodings['fs'], errors='strict'), 
 				mode='a+', encoding=_encodings['content'], errors='strict')
 			checkfile.write(self.nr+"\n")