From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 18 Sep 2010 10:35:41 +0000 (+0200)
Subject: catch another case where using EROOT is absolutely not correct:
X-Git-Tag: v2.2_rc84~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1bd015bebf5820ab7e1661b82342bd6f07027fe;p=portage.git

catch another case where using EROOT is absolutely not correct:
when reading files from CONTENTS, don't prepend EROOT, since the package
already HAS prefix recorded in CONTENTS
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 3ec31e91b..320bb275a 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1374,7 +1374,8 @@ class dblink(object):
 		obj_index = contents_re.groupindex['obj']
 		dir_index = contents_re.groupindex['dir']
 		sym_index = contents_re.groupindex['sym']
-		myroot = self._eroot
+		# CONTENTS files already contain EPREFIX
+		myroot = self.settings['ROOT']
 		if myroot == os.path.sep:
 			myroot = None
 		pos = 0