Do NOT use EROOT when merging files to the live filesystem! It inevitably makes doubl...

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 80d67fb871750a8199c788959c540ecb902f2e85..ea54433c97b2d579083b7c4138e5a16f2048f5aa 100644 (file)
--- 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,