use ROOT, not EROOT so we don't get a double prefix

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index aff4d86c25bfeb431f63d70944f61bffaf0ca086..7ce342210b94f63a78a9e41bae0342e4e90f9597 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2045,7 +2045,7 @@ class dblink(object):
                        warnings.warn("The second parameter of the " + \
                                "portage.dbapi.vartree.dblink._match_contents()" + \
                                " is now unused. Instead " + \
-                               "self.settings['EROOT'] will be used.",
+                               "self.settings['ROOT'] will be used.",
                                DeprecationWarning, stacklevel=2)
 
                # don't use EROOT here, image already contains EPREFIX
@@ -2212,7 +2212,7 @@ class dblink(object):
                linkmap = self.vartree.dbapi._linkmap
                installed_instance = self._installed_instance
                old_contents = installed_instance.getcontents()
-               root = self._eroot
+               root = self.settings['ROOT']
                root_len = len(root) - 1
                lib_graph = digraph()
                path_node_map = {}
@@ -2323,7 +2323,7 @@ class dblink(object):
 
                os = _os_merge
                showMessage = self._display_merge
-               root = self._eroot
+               root = self.settings['ROOT']
 
                # Copy contents entries from the old package to the new one.
                new_contents = self.getcontents().copy()