From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 29 Sep 2010 11:19:08 +0000 (+0200)
Subject: use ROOT, not EROOT so we don't get a double prefix
X-Git-Tag: v2.2_rc90~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f7133254022290622cec3f93673ada1d316cff0;p=portage.git

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 b76b66955..91c5fda2e 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2046,7 +2046,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
@@ -2213,7 +2213,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 = {}
@@ -2324,7 +2324,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()