diff options
| author | Fabian Groffen <grobian@gentoo.org> | 2010-09-29 13:19:08 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-30 17:50:01 -0700 |
| commit | 33aa4ccff70afc7335be94fb2b1ee169b01e4a61 (patch) | |
| tree | f6749d6c2984fdabee6a62909b4fa429471ae4a7 /pym | |
| parent | e52e31462efae2d5769e51073187c7e10ae122f9 (diff) | |
| download | portage-33aa4ccff70afc7335be94fb2b1ee169b01e4a61.tar.gz portage-33aa4ccff70afc7335be94fb2b1ee169b01e4a61.tar.bz2 portage-33aa4ccff70afc7335be94fb2b1ee169b01e4a61.zip | |
use ROOT, not EROOT so we don't get a double prefix
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index aff4d86c2..7ce342210 100644 --- 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() |