diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-24 10:54:48 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-24 10:54:48 -0700 |
| commit | e45a3f15379d8de4a772e1c70eee51c3d0e358a5 (patch) | |
| tree | 2a77e5210448a738faa9cb8c81cd67a7387b39ac /pym/_emerge | |
| parent | 47232e37f2b7f63d670de54d1a10f4c1e0dcec99 (diff) | |
| download | portage-e45a3f15379d8de4a772e1c70eee51c3d0e358a5.tar.gz portage-e45a3f15379d8de4a772e1c70eee51c3d0e358a5.tar.bz2 portage-e45a3f15379d8de4a772e1c70eee51c3d0e358a5.zip | |
deprecate "root" attributes
In preparation for prefix support, were EROOT will be used in place of
ROOT in many places, deprecate unnecessary "root" attributes in order
to eliminate them as a possible source of confusion.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/BlockerDB.py | 5 | ||||
| -rw-r--r-- | pym/_emerge/FakeVartree.py | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 4819749e5..0033665e3 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -25,7 +25,7 @@ class BlockerDB(object): self._dep_check_trees = None self._fake_vartree = fake_vartree self._dep_check_trees = { - self._vartree.root : { + self._vartree.settings["ROOT"] : { "porttree" : fake_vartree, "vartree" : fake_vartree, }} @@ -36,7 +36,8 @@ class BlockerDB(object): new_pkg is planned to be installed. This ignores build-time blockers, since new_pkg is assumed to be built already. """ - blocker_cache = BlockerCache(self._vartree.root, self._vartree.dbapi) + blocker_cache = BlockerCache(self._vartree.settings["ROOT"], + self._vartree.dbapi) dep_keys = ["RDEPEND", "PDEPEND"] settings = self._vartree.settings stale_cache = set(blocker_cache) diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index ddec7c504..a2b923248 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 import sys +import warnings import portage from portage import os @@ -49,7 +50,6 @@ class FakeVartree(vartree): real_vartree = root_config.trees["vartree"] self._real_vardb = real_vartree.dbapi portdb = root_config.trees["porttree"].dbapi - self.root = real_vartree.root self.settings = real_vartree.settings mykeys = list(real_vartree.dbapi._aux_cache_keys) if "_mtime_" not in mykeys: @@ -71,6 +71,15 @@ class FakeVartree(vartree): self._portdb = portdb self._global_updates = None + @property + def root(self): + warnings.warn("The root attribute of " + "_emerge.FakeVartree.FakeVartree" + " is deprecated. Use " + "settings['ROOT'] instead.", + DeprecationWarning, stacklevel=2) + return self.settings['ROOT'] + def _match_wrapper(self, cpv, use_cache=1): """ Make sure the metadata in Package instances gets updated for any |