From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 23 Sep 2010 16:55:22 +0000 (+0200)
Subject: always use eroot with CONFIG_MEMORY_FILE
X-Git-Tag: v2.2_rc87~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6fc2aa5486ade4fe0f9a71b231c1a25769ad27c3;p=portage.git

always use eroot with CONFIG_MEMORY_FILE
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 320bb275a..aff4d86c2 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2770,7 +2770,7 @@ class dblink(object):
 		
 		@param srcroot: Typically this is ${D}
 		@type srcroot: String (Path)
-		@param destroot: ignored, self._eroot is used instead
+		@param destroot: ignored, self.settings['ROOT'] is used instead
 		@type destroot: String (Path)
 		@param inforoot: root of the vardb entry ?
 		@type inforoot: String (Path)
@@ -3188,7 +3188,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(self._eroot, CONFIG_MEMORY_FILE)
 		cfgfiledict = grabdict(conf_mem_file)
 		cfgfiledict_orig = cfgfiledict.copy()
 		if "NOCONFMEM" in self.settings: