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 1RG40k-0007kX-CN for garchives@archives.gentoo.org; Tue, 18 Oct 2011 07:22:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D40F221C0A0; Tue, 18 Oct 2011 07:22:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A8BC721C0A0 for ; Tue, 18 Oct 2011 07:22:46 +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 1FB8F1B4010 for ; Tue, 18 Oct 2011 07:22:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 63E1C80042 for ; Tue, 18 Oct 2011 07:22:45 +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/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: dac6b249202ce69cd21a07cfd908ef31c9f595b9 Date: Tue, 18 Oct 2011 07:22:45 +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: 9d72d34cab16c9a8d58342a91592608c commit: dac6b249202ce69cd21a07cfd908ef31c9f595b9 Author: Zac Medico gentoo org> AuthorDate: Tue Oct 18 07:22:33 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Oct 18 07:22:33 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Ddac6b249 /etc/portage/modules: warn about metadata_overlay This module is an alias for flat_hash now, and hasn't been useful since FEATURES=3Dmetadata-transfer was disabled by default in commit 81db3e467cd7f8bb94fcdf96d5fb4acf27bf382b. --- pym/portage/package/ebuild/config.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index 542cfac..d49ac60 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -309,12 +309,19 @@ class config(object): =20 self.module_priority =3D ("user", "default") self.modules =3D {} - modules_loader =3D KeyValuePairFileLoader( - os.path.join(config_root, MODULES_FILE_PATH), None, None) + modules_file =3D os.path.join(config_root, MODULES_FILE_PATH) + modules_loader =3D KeyValuePairFileLoader(modules_file, None, None) modules_dict, modules_errors =3D modules_loader.load() self.modules["user"] =3D modules_dict if self.modules["user"] is None: self.modules["user"] =3D {} + user_auxdbmodule =3D \ + self.modules["user"].get("portdbapi.auxdbmodule") + if user_auxdbmodule is not None and \ + user_auxdbmodule in self._module_aliases: + warnings.warn("'%s' is deprecated: %s" % + (user_auxdbmodule, modules_file)) + self.modules["default"] =3D { "portdbapi.auxdbmodule": "portage.cache.flat_hash.database", }