From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C4F211381F4 for ; Thu, 21 Apr 2016 16:55:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E445F21C07C; Thu, 21 Apr 2016 16:54:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57B3B21C075 for ; Thu, 21 Apr 2016 16:54:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35DA6340C9D for ; Thu, 21 Apr 2016 16:54:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B41B233B for ; Thu, 21 Apr 2016 16:54:36 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1461257494.96dc91e77da08c7ba30974ee65c9f3ae876e5b39.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/scanner.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 96dc91e77da08c7ba30974ee65c9f3ae876e5b39 X-VCS-Branch: repoman Date: Thu, 21 Apr 2016 16:54:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f1ce1bcc-5f39-4a8d-9a1d-95e16b8c0699 X-Archives-Hash: 1c186a5800ff058f79f259205e0c4015 commit: 96dc91e77da08c7ba30974ee65c9f3ae876e5b39 Author: Brian Dolbec gentoo org> AuthorDate: Sat Apr 16 23:29:20 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Apr 21 16:51:34 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=96dc91e7 repoman: Limit the kwargs passed to the module's __init__() This has the benefit of forcing the module to declare what data it requires. Rather than possibly silently fail. pym/repoman/scanner.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index e9a8e20..5ac519e 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -202,7 +202,18 @@ class Scanner(object): 'fetches', 'pkgmetadata']: mod_class = MODULE_CONTROLLER.get_class(mod) logging.debug("Initializing class name: %s", mod_class.__name__) - self.modules[mod_class.__name__] = mod_class(**self.kwargs) + self.modules[mod_class.__name__] = mod_class(**self.set_kwargs(mod)) + + def set_kwargs(self, mod): + '''Creates a limited set of kwargs to pass to the module's __init__() + + @param mod: module name string + @returns: dictionary + ''' + kwargs = {} + for key in MODULE_CONTROLLER.modules[mod]['mod_kwargs']: + kwargs[key] = self.kwargs[key] + return kwargs def scan_pkgs(self, can_force): for xpkg in self.effective_scanlist: @@ -295,7 +306,7 @@ class Scanner(object): if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) logging.debug("Initializing class name: %s", mod_class.__name__) - self.modules[mod[1]] = mod_class(**self.kwargs) + self.modules[mod[1]] = mod_class(**self.set_kwargs(mod)) logging.debug("scan_ebuilds: module: %s", mod[1]) do_it, functions = self.modules[mod[1]].runInEbuilds logging.debug("do_it: %s, functions: %s", do_it, [x.__name__ for x in functions]) @@ -329,7 +340,7 @@ class Scanner(object): if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) logging.debug("Initializing class name: %s", mod_class.__name__) - self.modules[mod[1]] = mod_class(**self.kwargs) + self.modules[mod[1]] = mod_class(**self.set_kwargs(mod)) logging.debug("scan_ebuilds final checks: module: %s", mod[1]) do_it, functions = self.modules[mod[1]].runInFinal logging.debug("do_it: %s, functions: %s", do_it, [x.__name__ for x in functions])