use ROOT, not EROOT so we don't get a double prefix
authorFabian Groffen <grobian@gentoo.org>
Wed, 29 Sep 2010 11:25:37 +0000 (13:25 +0200)
committerZac Medico <zmedico@gentoo.org>
Fri, 1 Oct 2010 00:50:28 +0000 (17:50 -0700)
pym/portage/dbapi/vartree.py

index 7ce342210b94f63a78a9e41bae0342e4e90f9597..e72efc59a4bccef923a50d4c1dbb45d99e8da838 100644 (file)
@@ -2380,7 +2380,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)
@@ -2479,7 +2479,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: