[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/options/, pym/repoman/

[Brian Dolbec]

commit:     2290fc1382ac8051f595187bda03dc25fcb3b6fb
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: Mon Mar  7 21:21:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2290fc13

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  | 18 ++++++++++++++++++
 pym/repoman/scanner.py                       | 10 ++--------
 3 files changed, 44 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..c2546d6
--- /dev/null
+++ b/pym/repoman/modules/scan/options/options.py
@@ -0,0 +1,18 @@
+
+
+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 runInEbuilds(self):
+		return (True, [self.is_forced])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 78ff053..2625de4 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: