commit: 075a66c9092b54e0846e494a2b7f92f5d981f957 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Mon Jan 4 07:55:55 2016 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Sat Jan 30 06:51:57 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=075a66c9
repoman: Create a new Options class plugin This handles an options.force bypass using the is_forced() from withing the plugin system. pym/repoman/modules/scan/options/__init__.py | 24 ++++++++++++++++++++++++ pym/repoman/modules/scan/options/options.py | 22 ++++++++++++++++++++++ pym/repoman/scanner.py | 10 ++-------- 3 files changed, 48 insertions(+), 8 deletions(-) diff --git a/pym/repoman/modules/scan/options/__init__.py b/pym/repoman/modules/scan/options/__init__.py new file mode 100644 index 0000000..2d3d9d2 --- /dev/null +++ b/pym/repoman/modules/scan/options/__init__.py @@ -0,0 +1,24 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Options plug-in module for repoman. +Performs option related actions on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'options', + 'description': doc, + 'provides':{ + 'options-module': { + 'name': "options", + 'sourcefile': "options", + 'class': "Options", + 'description': doc, + 'functions': ['is_forced'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/modules/scan/options/options.py b/pym/repoman/modules/scan/options/options.py new file mode 100644 index 0000000..b592884 --- /dev/null +++ b/pym/repoman/modules/scan/options/options.py @@ -0,0 +1,22 @@ + + +class Options(object): + + def __init__(self, **kwargs): + self.options = kwargs.get('options') + + def is_forced(self, **kwargs): + if self.options.force: + # The dep_check() calls are the most expensive QA test. If --force + # is enabled, there's no point in wasting time on these since the + # user is intent on forcing the commit anyway. + return {'continue': True} + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.is_forced]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 9fe5f26..b9c53a0 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -291,6 +291,8 @@ class Scanner(object): ('use_flags', 'USEFlagChecks'), ('ruby', 'RubyEclassChecks'), ('license', 'LicenseChecks'), ('restrict', 'RestrictChecks'), ('mtime', 'MtimeChecks'), ('multicheck', 'MultiCheck'), + # Options.is_forced() is used to bypass further checks + ('options', 'Options'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -318,14 +320,6 @@ class Scanner(object): if y_ebuild_continue: continue - # Syntax Checks - - if self.options.force: - # The dep_check() calls are the most expensive QA test. If --force - # is enabled, there's no point in wasting time on these since the - # user is intent on forcing the commit anyway. - continue - relevant_profiles = [] for keyword, arch, groups in dynamic_data['arches']: if arch not in self.profiles: