From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 29 Sep 2010 11:25:37 +0000 (+0200)
Subject: use ROOT, not EROOT so we don't get a double prefix
X-Git-Tag: v2.2_rc90~87
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11ec19654d5fd74b148a08a68cd09f0cb83cbf64;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 91c5fda2e..fa309b007 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2381,7 +2381,7 @@ class dblink(object):
 		preserved_paths = set()
 		path_cpv_map = {}
 		path_node_map = {}
-		root = self._eroot
+		root = self.settings['ROOT']
 
 		def path_to_node(path):
 			node = path_node_map.get(path)
@@ -2480,7 +2480,7 @@ class dblink(object):
 			files_to_remove.update(files)
 		files_to_remove = sorted(files_to_remove)
 		showMessage = self._display_merge
-		root = self._eroot
+		root = self.settings['ROOT']
 
 		parent_dirs = set()
 		for obj in files_to_remove: