* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/ebuild/, repoman/pym/repoman/
@ 2017-07-15 2:29 Brian Dolbec
0 siblings, 0 replies; 4+ messages in thread
From: Brian Dolbec @ 2017-07-15 2:29 UTC (permalink / raw
To: gentoo-commits
commit: 720c6dc38b69e10477bd4bd8c08d85291e811432
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 01:09:03 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 02:25:45 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=720c6dc3
repoman: Convert multicheck module to the new linechecks sub-module
repoman/pym/repoman/modules/scan/ebuild/__init__.py | 2 +-
repoman/pym/repoman/modules/scan/ebuild/multicheck.py | 10 +++++++---
repoman/pym/repoman/scanner.py | 1 +
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/repoman/pym/repoman/modules/scan/ebuild/__init__.py b/repoman/pym/repoman/modules/scan/ebuild/__init__.py
index 3e1d31951..1d8ec1941 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/repoman/pym/repoman/modules/scan/ebuild/__init__.py
@@ -47,7 +47,7 @@ module_spec = {
'functions': ['check'],
'func_kwargs': {
},
- 'mod_kwargs': ['qatracker', 'options'
+ 'mod_kwargs': ['qatracker', 'options', 'repo_settings', 'linechecks',
],
'func_kwargs': {
'ebuild': (None, None),
diff --git a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
index 9e36e2a68..94526ae9e 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
+++ b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
@@ -8,7 +8,7 @@ import io
from portage import _encodings, _unicode_encode
from repoman.modules.scan.scanbase import ScanBase
-from .checks import run_checks, checks_init
+from repoman.modules.linechecks.controller import LineCheckController
class MultiCheck(ScanBase):
@@ -22,7 +22,11 @@ class MultiCheck(ScanBase):
'''
self.qatracker = kwargs.get('qatracker')
self.options = kwargs.get('options')
- checks_init(self.options.experimental_inherit == 'y')
+ self.controller = LineCheckController(
+ kwargs.get('repo_settings'),
+ kwargs.get('linechecks')
+ )
+ self.controller.checks_init(self.options.experimental_inherit == 'y')
def check(self, **kwargs):
'''Check the ebuild for utf-8 encoding
@@ -40,7 +44,7 @@ class MultiCheck(ScanBase):
errors='strict'),
mode='r', encoding=_encodings['repo.content'])
try:
- for check_name, e in run_checks(f, pkg):
+ for check_name, e in self.controller.run_checks(f, pkg):
self.qatracker.add_error(
check_name, ebuild.relative_path + ': %s' % e)
finally:
diff --git a/repoman/pym/repoman/scanner.py b/repoman/pym/repoman/scanner.py
index b3d030570..d61e50131 100644
--- a/repoman/pym/repoman/scanner.py
+++ b/repoman/pym/repoman/scanner.py
@@ -193,6 +193,7 @@ class Scanner(object):
"env": self.env,
"have": self.have,
"dev_keywords": self.dev_keywords,
+ "linechecks": self.moduleconfig.linechecks,
}
# initialize the plugin checks here
self.modules = {}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/ebuild/, repoman/pym/repoman/
@ 2018-03-29 21:35 Brian Dolbec
0 siblings, 0 replies; 4+ messages in thread
From: Brian Dolbec @ 2018-03-29 21:35 UTC (permalink / raw
To: gentoo-commits
commit: cea895f75fe43e61042da591b1e77f9d0ea2c6ae
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 01:09:03 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 20:43:40 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cea895f7
repoman: Convert multicheck module to the new linechecks sub-module
repoman/pym/repoman/modules/scan/ebuild/__init__.py | 2 +-
repoman/pym/repoman/modules/scan/ebuild/multicheck.py | 10 +++++++---
repoman/pym/repoman/scanner.py | 1 +
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/repoman/pym/repoman/modules/scan/ebuild/__init__.py b/repoman/pym/repoman/modules/scan/ebuild/__init__.py
index 3e1d31951..1d8ec1941 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/repoman/pym/repoman/modules/scan/ebuild/__init__.py
@@ -47,7 +47,7 @@ module_spec = {
'functions': ['check'],
'func_kwargs': {
},
- 'mod_kwargs': ['qatracker', 'options'
+ 'mod_kwargs': ['qatracker', 'options', 'repo_settings', 'linechecks',
],
'func_kwargs': {
'ebuild': (None, None),
diff --git a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
index 9e36e2a68..94526ae9e 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
+++ b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
@@ -8,7 +8,7 @@ import io
from portage import _encodings, _unicode_encode
from repoman.modules.scan.scanbase import ScanBase
-from .checks import run_checks, checks_init
+from repoman.modules.linechecks.controller import LineCheckController
class MultiCheck(ScanBase):
@@ -22,7 +22,11 @@ class MultiCheck(ScanBase):
'''
self.qatracker = kwargs.get('qatracker')
self.options = kwargs.get('options')
- checks_init(self.options.experimental_inherit == 'y')
+ self.controller = LineCheckController(
+ kwargs.get('repo_settings'),
+ kwargs.get('linechecks')
+ )
+ self.controller.checks_init(self.options.experimental_inherit == 'y')
def check(self, **kwargs):
'''Check the ebuild for utf-8 encoding
@@ -40,7 +44,7 @@ class MultiCheck(ScanBase):
errors='strict'),
mode='r', encoding=_encodings['repo.content'])
try:
- for check_name, e in run_checks(f, pkg):
+ for check_name, e in self.controller.run_checks(f, pkg):
self.qatracker.add_error(
check_name, ebuild.relative_path + ': %s' % e)
finally:
diff --git a/repoman/pym/repoman/scanner.py b/repoman/pym/repoman/scanner.py
index b3d030570..d61e50131 100644
--- a/repoman/pym/repoman/scanner.py
+++ b/repoman/pym/repoman/scanner.py
@@ -193,6 +193,7 @@ class Scanner(object):
"env": self.env,
"have": self.have,
"dev_keywords": self.dev_keywords,
+ "linechecks": self.moduleconfig.linechecks,
}
# initialize the plugin checks here
self.modules = {}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/ebuild/, repoman/pym/repoman/
@ 2018-03-30 0:48 Brian Dolbec
0 siblings, 0 replies; 4+ messages in thread
From: Brian Dolbec @ 2018-03-30 0:48 UTC (permalink / raw
To: gentoo-commits
commit: dec86d1bc9b9f200ff95434e03208a9504b20d60
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 01:09:03 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 00:43:46 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=dec86d1b
repoman: Convert multicheck module to the new linechecks sub-module
repoman/pym/repoman/modules/scan/ebuild/__init__.py | 2 +-
repoman/pym/repoman/modules/scan/ebuild/multicheck.py | 10 +++++++---
repoman/pym/repoman/scanner.py | 1 +
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/repoman/pym/repoman/modules/scan/ebuild/__init__.py b/repoman/pym/repoman/modules/scan/ebuild/__init__.py
index 3e1d31951..1d8ec1941 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/repoman/pym/repoman/modules/scan/ebuild/__init__.py
@@ -47,7 +47,7 @@ module_spec = {
'functions': ['check'],
'func_kwargs': {
},
- 'mod_kwargs': ['qatracker', 'options'
+ 'mod_kwargs': ['qatracker', 'options', 'repo_settings', 'linechecks',
],
'func_kwargs': {
'ebuild': (None, None),
diff --git a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
index 9e36e2a68..94526ae9e 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
+++ b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
@@ -8,7 +8,7 @@ import io
from portage import _encodings, _unicode_encode
from repoman.modules.scan.scanbase import ScanBase
-from .checks import run_checks, checks_init
+from repoman.modules.linechecks.controller import LineCheckController
class MultiCheck(ScanBase):
@@ -22,7 +22,11 @@ class MultiCheck(ScanBase):
'''
self.qatracker = kwargs.get('qatracker')
self.options = kwargs.get('options')
- checks_init(self.options.experimental_inherit == 'y')
+ self.controller = LineCheckController(
+ kwargs.get('repo_settings'),
+ kwargs.get('linechecks')
+ )
+ self.controller.checks_init(self.options.experimental_inherit == 'y')
def check(self, **kwargs):
'''Check the ebuild for utf-8 encoding
@@ -40,7 +44,7 @@ class MultiCheck(ScanBase):
errors='strict'),
mode='r', encoding=_encodings['repo.content'])
try:
- for check_name, e in run_checks(f, pkg):
+ for check_name, e in self.controller.run_checks(f, pkg):
self.qatracker.add_error(
check_name, ebuild.relative_path + ': %s' % e)
finally:
diff --git a/repoman/pym/repoman/scanner.py b/repoman/pym/repoman/scanner.py
index b3d030570..d61e50131 100644
--- a/repoman/pym/repoman/scanner.py
+++ b/repoman/pym/repoman/scanner.py
@@ -193,6 +193,7 @@ class Scanner(object):
"env": self.env,
"have": self.have,
"dev_keywords": self.dev_keywords,
+ "linechecks": self.moduleconfig.linechecks,
}
# initialize the plugin checks here
self.modules = {}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/ebuild/, repoman/pym/repoman/
2018-03-30 4:23 [gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/ebuild/ Zac Medico
@ 2018-03-30 5:20 ` Zac Medico
0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico @ 2018-03-30 5:20 UTC (permalink / raw
To: gentoo-commits
commit: ef62ffac353970086f93d84541725ef718100c7b
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 01:09:03 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 03:51:20 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ef62ffac
repoman: Convert multicheck module to the new linechecks sub-module
repoman/pym/repoman/modules/scan/ebuild/__init__.py | 2 +-
repoman/pym/repoman/modules/scan/ebuild/multicheck.py | 10 +++++++---
repoman/pym/repoman/scanner.py | 1 +
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/repoman/pym/repoman/modules/scan/ebuild/__init__.py b/repoman/pym/repoman/modules/scan/ebuild/__init__.py
index 3e1d31951..1d8ec1941 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/repoman/pym/repoman/modules/scan/ebuild/__init__.py
@@ -47,7 +47,7 @@ module_spec = {
'functions': ['check'],
'func_kwargs': {
},
- 'mod_kwargs': ['qatracker', 'options'
+ 'mod_kwargs': ['qatracker', 'options', 'repo_settings', 'linechecks',
],
'func_kwargs': {
'ebuild': (None, None),
diff --git a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
index 9e36e2a68..94526ae9e 100644
--- a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
+++ b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
@@ -8,7 +8,7 @@ import io
from portage import _encodings, _unicode_encode
from repoman.modules.scan.scanbase import ScanBase
-from .checks import run_checks, checks_init
+from repoman.modules.linechecks.controller import LineCheckController
class MultiCheck(ScanBase):
@@ -22,7 +22,11 @@ class MultiCheck(ScanBase):
'''
self.qatracker = kwargs.get('qatracker')
self.options = kwargs.get('options')
- checks_init(self.options.experimental_inherit == 'y')
+ self.controller = LineCheckController(
+ kwargs.get('repo_settings'),
+ kwargs.get('linechecks')
+ )
+ self.controller.checks_init(self.options.experimental_inherit == 'y')
def check(self, **kwargs):
'''Check the ebuild for utf-8 encoding
@@ -40,7 +44,7 @@ class MultiCheck(ScanBase):
errors='strict'),
mode='r', encoding=_encodings['repo.content'])
try:
- for check_name, e in run_checks(f, pkg):
+ for check_name, e in self.controller.run_checks(f, pkg):
self.qatracker.add_error(
check_name, ebuild.relative_path + ': %s' % e)
finally:
diff --git a/repoman/pym/repoman/scanner.py b/repoman/pym/repoman/scanner.py
index b3d030570..d61e50131 100644
--- a/repoman/pym/repoman/scanner.py
+++ b/repoman/pym/repoman/scanner.py
@@ -193,6 +193,7 @@ class Scanner(object):
"env": self.env,
"have": self.have,
"dev_keywords": self.dev_keywords,
+ "linechecks": self.moduleconfig.linechecks,
}
# initialize the plugin checks here
self.modules = {}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-30 5:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-29 21:35 [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/ebuild/, repoman/pym/repoman/ Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2018-03-30 4:23 [gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/ebuild/ Zac Medico
2018-03-30 5:20 ` [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/ebuild/, repoman/pym/repoman/ Zac Medico
2018-03-30 0:48 Brian Dolbec
2017-07-15 2:29 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox