From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 16 Jul 2008 18:11:32 +0000 (-0000)
Subject: fix more prefix errors
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3788b829158af383a482b39d6aa4c0ca94a7a8b3;p=portage.git

fix more prefix errors

svn path=/main/branches/prefix/; revision=11087
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 69f1c6773..69f496e66 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1694,7 +1694,7 @@ class config(object):
 		dir_mode_map = {
 			EPREFIX_LSTRIP+"/tmp" : (                  -1, 01777,  0,  True),
 			EPREFIX_LSTRIP+"/var/tmp" : (              -1, 01777,  0,  True),
-			EPREFIX_LSTRIP+PRIVATE_PATH : (   portage_gid, 02750, 02,  False),
+			EPREFIX_LSTRIP+"/"+PRIVATE_PATH :(portage_gid, 02750, 02,  False),
 			CACHE_PATH.lstrip(os.path.sep) : (portage_gid,  0755, 02,  False)
 		}
 
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index ba163dbea..a42bacf2c 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1927,7 +1927,7 @@ class dblink(object):
 			os.path.sep
 		dest_root_len = len(dest_root) - 1
 
-		conf_mem_file = os.path.join(dest_root, CONFIG_MEMORY_FILE)
+		conf_mem_file = os.path.join(dest_root, EPREFIX_LSTRIP, CONFIG_MEMORY_FILE)
 		cfgfiledict = grabdict(conf_mem_file)
 		stale_confmem = []
 
@@ -2780,7 +2780,7 @@ class dblink(object):
 		self.updateprotect()
 
 		#if we have a file containing previously-merged config file md5sums, grab it.
-		conf_mem_file = os.path.join(destroot, CONFIG_MEMORY_FILE)
+		conf_mem_file = os.path.join(destroot, EPREFIX_LSTRIP, CONFIG_MEMORY_FILE)
 		cfgfiledict = grabdict(conf_mem_file)
 		if "NOCONFMEM" in self.settings:
 			cfgfiledict["IGNORE"]=1