From 2b5eef1c7410bc2bb8088de480072664168ed2e8 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 8 Sep 2010 22:18:44 +0200 Subject: [PATCH] catch another case where using EROOT is absolutely not correct: when reading files from CONTENTS, don't prepend EROOT, since they the package already HAS prefix recorded in CONTENTS --- pym/portage/dbapi/vartree.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index c526d2269..2a5974395 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1365,7 +1365,9 @@ class dblink(object): obj_index = contents_re.groupindex['obj'] dir_index = contents_re.groupindex['dir'] sym_index = contents_re.groupindex['sym'] - myroot = self._eroot + # PREFIX LOCAL: don't prepend EROOT! + myroot = self.root + # PREFIX LOCAL if myroot == os.path.sep: myroot = None pos = 0 -- 2.26.2