From dac6b249202ce69cd21a07cfd908ef31c9f595b9 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 18 Oct 2011 00:22:33 -0700 Subject: /etc/portage/modules: warn about metadata_overlay This module is an alias for flat_hash now, and hasn't been useful since FEATURES=metadata-transfer was disabled by default in commit 81db3e467cd7f8bb94fcdf96d5fb4acf27bf382b. --- pym/portage/package/ebuild/config.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 542cfaca5..d49ac600a 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -309,12 +309,19 @@ class config(object): self.module_priority = ("user", "default") self.modules = {} - modules_loader = KeyValuePairFileLoader( - os.path.join(config_root, MODULES_FILE_PATH), None, None) + modules_file = os.path.join(config_root, MODULES_FILE_PATH) + modules_loader = KeyValuePairFileLoader(modules_file, None, None) modules_dict, modules_errors = modules_loader.load() self.modules["user"] = modules_dict if self.modules["user"] is None: self.modules["user"] = {} + user_auxdbmodule = \ + 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"] = { "portdbapi.auxdbmodule": "portage.cache.flat_hash.database", } -- cgit v1.2.3-1-g7c22