From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 24 Oct 2009 12:16:59 +0000 (-0000)
Subject: another occurrence of CONFIG_MEMORY_FILE which already includes EPREFIX, so don't... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f1e760ef0235c1be562d96eccf2c57b13fbfebd6;p=portage.git

another occurrence of CONFIG_MEMORY_FILE which already includes EPREFIX, so don't add it again, thanks Nikolas Olivier in bug #290254

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 35632c829..4d94398d8 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -4462,7 +4462,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, EPREFIX_LSTRIP, CONFIG_MEMORY_FILE)
+		conf_mem_file = os.path.join(destroot, CONFIG_MEMORY_FILE)
 		cfgfiledict = grabdict(conf_mem_file)
 		cfgfiledict_orig = cfgfiledict.copy()
 		if "NOCONFMEM" in self.settings: