diff options
| author | Fabian Groffen <grobian@gentoo.org> | 2010-09-18 12:35:41 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-09-18 12:35:41 +0200 |
| commit | e1bd015bebf5820ab7e1661b82342bd6f07027fe (patch) | |
| tree | fdb1bfaa5422be90c887778c0b09f9b960ec8557 | |
| parent | 61e2de2e71982a66552838adfa3e7f518a39e0fe (diff) | |
| download | portage-e1bd015bebf5820ab7e1661b82342bd6f07027fe.tar.gz portage-e1bd015bebf5820ab7e1661b82342bd6f07027fe.tar.bz2 portage-e1bd015bebf5820ab7e1661b82342bd6f07027fe.zip | |
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
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |