summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-09-23 18:55:22 +0200
committerFabian Groffen <grobian@gentoo.org>2010-09-23 18:55:22 +0200
commit6fc2aa5486ade4fe0f9a71b231c1a25769ad27c3 (patch)
treefe3db11874c6687507173287792fab55b5270e1c
parent0d7eb266a9d7909591817e4fd899c1c2ab07b53c (diff)
downloadportage-6fc2aa5486ade4fe0f9a71b231c1a25769ad27c3.tar.gz
portage-6fc2aa5486ade4fe0f9a71b231c1a25769ad27c3.tar.bz2
portage-6fc2aa5486ade4fe0f9a71b231c1a25769ad27c3.zip
always use eroot with CONFIG_MEMORY_FILE
-rw-r--r--pym/portage/dbapi/vartree.py4
1 files changed, 2 insertions, 2 deletions
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: