From 77238b47f55ed3c29a3d57fd26aeadf1550fd292 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 5 Sep 2010 22:12:23 +0200 Subject: Do NOT use EROOT when merging files to the live filesystem! It inevitably makes double offsets occur --- pym/portage/dbapi/vartree.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 80d67fb87..ea54433c9 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2043,7 +2043,9 @@ class dblink(object): "self.settings['EROOT'] will be used.", DeprecationWarning, stacklevel=2) - destroot = self._eroot + # PREFIX LOCAL: don't use eroot here + destroot = self.settings['ROOT'] + # PREFIX LOCAL # The given filename argument might have a different encoding than the # the filenames contained in the contents, so use separate wrapped os @@ -2539,7 +2541,9 @@ class dblink(object): scheduler = self._scheduler stopmerge = False collisions = [] - destroot = self._eroot + # PREFIX LOCAL: don't use eroot here + destroot = self.settings['ROOT'] + # PREFIX LOCAL showMessage(_(" %s checking %d files for package collisions\n") % \ (colorize("GOOD", "*"), len(mycontents))) for i, f in enumerate(mycontents): @@ -2787,7 +2791,10 @@ class dblink(object): srcroot = _unicode_decode(srcroot, encoding=_encodings['content'], errors='strict') - destroot = self._eroot + # PREFIX LOCAL: no eroot here, image dir already has EPREFIX, + # will end up with double prefix in installation + destroot = self.settings['ROOT'] + # PREFIX LOCAL inforoot = _unicode_decode(inforoot, encoding=_encodings['content'], errors='strict') myebuild = _unicode_decode(myebuild, -- cgit v1.2.3-1-g7c22