From e1bd015bebf5820ab7e1661b82342bd6f07027fe Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 18 Sep 2010 12:35:41 +0200 Subject: 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 --- pym/portage/dbapi/vartree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-1-g7c22