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 3ec31e91b3f803d92a2ba2a88afc756e5dd862df..320bb275aeea0eb82a540e2098fb198f8502882b 100644 (file)
--- 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