From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RIOjt-0007Q1-TM for garchives@archives.gentoo.org; Mon, 24 Oct 2011 17:55:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A4E221C03B; Mon, 24 Oct 2011 17:55:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CAC5C21C03B for ; Mon, 24 Oct 2011 17:55:02 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 389371B400B for ; Mon, 24 Oct 2011 17:55:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9B79880042 for ; Mon, 24 Oct 2011 17:55:01 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/portage/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/BlockerDB.py pym/_emerge/FakeVartree.py pym/portage/dbapi/bintree.py pym/portage/dbapi/vartree.py pym/portage/news.py X-VCS-Directories: pym/portage/dbapi/ pym/portage/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e45a3f15379d8de4a772e1c70eee51c3d0e358a5 Date: Mon, 24 Oct 2011 17:55:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b946a0c080f4edf0c6c9f7195eedf339 commit: e45a3f15379d8de4a772e1c70eee51c3d0e358a5 Author: Zac Medico gentoo org> AuthorDate: Mon Oct 24 17:54:48 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Oct 24 17:54:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De45a3f15 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. --- pym/_emerge/BlockerDB.py | 5 +++-- pym/_emerge/FakeVartree.py | 11 ++++++++++- pym/portage/dbapi/bintree.py | 28 +++++++++++++++++++++++++--- pym/portage/dbapi/vartree.py | 40 ++++++++++++++++++++++++++++--------= ---- pym/portage/news.py | 2 +- 5 files changed, 67 insertions(+), 19 deletions(-) diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 4819749..0033665 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -25,7 +25,7 @@ class BlockerDB(object): self._dep_check_trees =3D None self._fake_vartree =3D fake_vartree self._dep_check_trees =3D { - 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 =3D BlockerCache(self._vartree.root, self._vartree.dbapi= ) + blocker_cache =3D BlockerCache(self._vartree.settings["ROOT"], + self._vartree.dbapi) dep_keys =3D ["RDEPEND", "PDEPEND"] settings =3D self._vartree.settings stale_cache =3D set(blocker_cache) diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index ddec7c5..a2b9232 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 =20 import sys +import warnings =20 import portage from portage import os @@ -49,7 +50,6 @@ class FakeVartree(vartree): real_vartree =3D root_config.trees["vartree"] self._real_vardb =3D real_vartree.dbapi portdb =3D root_config.trees["porttree"].dbapi - self.root =3D real_vartree.root self.settings =3D real_vartree.settings mykeys =3D list(real_vartree.dbapi._aux_cache_keys) if "_mtime_" not in mykeys: @@ -71,6 +71,15 @@ class FakeVartree(vartree): self._portdb =3D portdb self._global_updates =3D None =20 + @property + def root(self): + warnings.warn("The root attribute of " + "_emerge.FakeVartree.FakeVartree" + " is deprecated. Use " + "settings['ROOT'] instead.", + DeprecationWarning, stacklevel=3D2) + return self.settings['ROOT'] + def _match_wrapper(self, cpv, use_cache=3D1): """ Make sure the metadata in Package instances gets updated for any diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 5c091bd..39bb030 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -41,6 +41,7 @@ import subprocess import sys import tempfile import textwrap +import warnings from itertools import chain try: from urllib.parse import urlparse @@ -242,10 +243,22 @@ def _pkgindex_cpv_map_latest_build(pkgindex): =20 class binarytree(object): "this tree scans for a list of all packages available in PKGDIR" - def __init__(self, root, pkgdir, virtual=3DNone, settings=3DNone): + def __init__(self, _unused=3DNone, pkgdir=3DNone, virtual=3DNone, setti= ngs=3DNone): + + if pkgdir is None: + raise TypeError("pkgdir parameter is required") + + if settings is None: + raise TypeError("settings parameter is required") + + if _unused is not None and _unused !=3D settings['ROOT']: + warnings.warn("The root parameter of the " + "portage.dbapi.bintree.binarytree" + " constructor is now unused. Use " + "settings['ROOT'] instead.", + DeprecationWarning, stacklevel=3D2) + if True: - self.root =3D root - #self.pkgdir=3Dsettings["PKGDIR"] self.pkgdir =3D normalize_path(pkgdir) self.dbapi =3D bindbapi(self, settings=3Dsettings) self.update_ents =3D self.dbapi.update_ents @@ -330,6 +343,15 @@ class binarytree(object): chain(*self._pkgindex_translated_keys) )) =20 + @property + def root(self): + warnings.warn("The root attribute of " + "portage.dbapi.bintree.binarytree" + " is deprecated. Use " + "settings['ROOT'] instead.", + DeprecationWarning, stacklevel=3D2) + return self.settings['ROOT'] + def move_ent(self, mylist, repo_match=3DNone): if not self.populated: self.populate() diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 1fc95a3..b69b363 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -129,12 +129,11 @@ class vardbapi(dbapi): if settings is None: settings =3D portage.settings self.settings =3D settings - self.root =3D settings['ROOT'] =20 - if _unused_param is not None and _unused_param !=3D self.root: - warnings.warn("The first parameter of the " + \ - "portage.dbapi.vartree.vardbapi" + \ - " constructor is now unused. Use " + \ + if _unused_param is not None and _unused_param !=3D settings['ROOT']: + warnings.warn("The first parameter of the " + "portage.dbapi.vartree.vardbapi" + " constructor is now unused. Use " "settings['ROOT'] instead.", DeprecationWarning, stacklevel=3D2) =20 @@ -148,7 +147,7 @@ class vardbapi(dbapi): self._fs_lock_count =3D 0 =20 if vartree is None: - vartree =3D portage.db[self.root]["vartree"] + vartree =3D portage.db[settings["ROOT"]]["vartree"] self.vartree =3D vartree self._aux_cache_keys =3D set( ["BUILD_TIME", "CHOST", "COUNTER", "DEPEND", "DESCRIPTION", @@ -164,7 +163,7 @@ class vardbapi(dbapi): =20 self._plib_registry =3D None if _ENABLE_PRESERVE_LIBS: - self._plib_registry =3D PreservedLibsRegistry(self.root, + self._plib_registry =3D PreservedLibsRegistry(settings["ROOT"], os.path.join(self._eroot, PRIVATE_PATH, "preserved_libs_registry")) =20 @@ -175,6 +174,15 @@ class vardbapi(dbapi): =20 self._cached_counter =3D None =20 + @property + def root(self): + warnings.warn("The root attribute of " + "portage.dbapi.vartree.vardbapi" + " is deprecated. Use " + "settings['ROOT'] instead.", + DeprecationWarning, stacklevel=3D2) + return self.settings['ROOT'] + def getpath(self, mykey, filename=3DNone): # This is an optimized hotspot, so don't use unicode-wrapped # os module and don't use os.path.join(). @@ -1157,12 +1165,11 @@ class vartree(object): =20 if settings is None: settings =3D portage.settings - self.root =3D settings['ROOT'] =20 - if root is not None and root !=3D self.root: - warnings.warn("The 'root' parameter of the " + \ - "portage.dbapi.vartree.vartree" + \ - " constructor is now unused. Use " + \ + if root is not None and root !=3D settings['ROOT']: + warnings.warn("The 'root' parameter of the " + "portage.dbapi.vartree.vartree" + " constructor is now unused. Use " "settings['ROOT'] instead.", DeprecationWarning, stacklevel=3D2) =20 @@ -1170,6 +1177,15 @@ class vartree(object): self.dbapi =3D vardbapi(settings=3Dsettings, vartree=3Dself) self.populated =3D 1 =20 + @property + def root(self): + warnings.warn("The root attribute of " + "portage.dbapi.vartree.vartree" + " is deprecated. Use " + "settings['ROOT'] instead.", + DeprecationWarning, stacklevel=3D2) + return self.settings['ROOT'] + def getpath(self, mykey, filename=3DNone): return self.dbapi.getpath(mykey, filename=3Dfilename) =20 diff --git a/pym/portage/news.py b/pym/portage/news.py index 031e98c..1bf0522 100644 --- a/pym/portage/news.py +++ b/pym/portage/news.py @@ -39,7 +39,7 @@ class NewsManager(object): def __init__(self, portdb, vardb, news_path, unread_path, language_id=3D= 'en'): self.news_path =3D news_path self.unread_path =3D unread_path - self.target_root =3D vardb.root + self.target_root =3D vardb.settings["ROOT"] self.language_id =3D language_id self.config =3D vardb.settings self.vdb =3D vardb