| 1 |
commit: ef62ffac353970086f93d84541725ef718100c7b |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 15 01:09:03 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 30 03:51:20 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ef62ffac |
| 7 |
|
| 8 |
repoman: Convert multicheck module to the new linechecks sub-module |
| 9 |
|
| 10 |
repoman/pym/repoman/modules/scan/ebuild/__init__.py | 2 +- |
| 11 |
repoman/pym/repoman/modules/scan/ebuild/multicheck.py | 10 +++++++--- |
| 12 |
repoman/pym/repoman/scanner.py | 1 + |
| 13 |
3 files changed, 9 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/repoman/pym/repoman/modules/scan/ebuild/__init__.py b/repoman/pym/repoman/modules/scan/ebuild/__init__.py |
| 16 |
index 3e1d31951..1d8ec1941 100644 |
| 17 |
--- a/repoman/pym/repoman/modules/scan/ebuild/__init__.py |
| 18 |
+++ b/repoman/pym/repoman/modules/scan/ebuild/__init__.py |
| 19 |
@@ -47,7 +47,7 @@ module_spec = { |
| 20 |
'functions': ['check'], |
| 21 |
'func_kwargs': { |
| 22 |
}, |
| 23 |
- 'mod_kwargs': ['qatracker', 'options' |
| 24 |
+ 'mod_kwargs': ['qatracker', 'options', 'repo_settings', 'linechecks', |
| 25 |
], |
| 26 |
'func_kwargs': { |
| 27 |
'ebuild': (None, None), |
| 28 |
|
| 29 |
diff --git a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py |
| 30 |
index 9e36e2a68..94526ae9e 100644 |
| 31 |
--- a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py |
| 32 |
+++ b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py |
| 33 |
@@ -8,7 +8,7 @@ import io |
| 34 |
from portage import _encodings, _unicode_encode |
| 35 |
|
| 36 |
from repoman.modules.scan.scanbase import ScanBase |
| 37 |
-from .checks import run_checks, checks_init |
| 38 |
+from repoman.modules.linechecks.controller import LineCheckController |
| 39 |
|
| 40 |
|
| 41 |
class MultiCheck(ScanBase): |
| 42 |
@@ -22,7 +22,11 @@ class MultiCheck(ScanBase): |
| 43 |
''' |
| 44 |
self.qatracker = kwargs.get('qatracker') |
| 45 |
self.options = kwargs.get('options') |
| 46 |
- checks_init(self.options.experimental_inherit == 'y') |
| 47 |
+ self.controller = LineCheckController( |
| 48 |
+ kwargs.get('repo_settings'), |
| 49 |
+ kwargs.get('linechecks') |
| 50 |
+ ) |
| 51 |
+ self.controller.checks_init(self.options.experimental_inherit == 'y') |
| 52 |
|
| 53 |
def check(self, **kwargs): |
| 54 |
'''Check the ebuild for utf-8 encoding |
| 55 |
@@ -40,7 +44,7 @@ class MultiCheck(ScanBase): |
| 56 |
errors='strict'), |
| 57 |
mode='r', encoding=_encodings['repo.content']) |
| 58 |
try: |
| 59 |
- for check_name, e in run_checks(f, pkg): |
| 60 |
+ for check_name, e in self.controller.run_checks(f, pkg): |
| 61 |
self.qatracker.add_error( |
| 62 |
check_name, ebuild.relative_path + ': %s' % e) |
| 63 |
finally: |
| 64 |
|
| 65 |
diff --git a/repoman/pym/repoman/scanner.py b/repoman/pym/repoman/scanner.py |
| 66 |
index b3d030570..d61e50131 100644 |
| 67 |
--- a/repoman/pym/repoman/scanner.py |
| 68 |
+++ b/repoman/pym/repoman/scanner.py |
| 69 |
@@ -193,6 +193,7 @@ class Scanner(object): |
| 70 |
"env": self.env, |
| 71 |
"have": self.have, |
| 72 |
"dev_keywords": self.dev_keywords, |
| 73 |
+ "linechecks": self.moduleconfig.linechecks, |
| 74 |
} |
| 75 |
# initialize the plugin checks here |
| 76 |
self.modules = {} |
Archives