public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/ebuild/
@ 2017-07-15  2:08 Brian Dolbec
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2017-07-15  2:08 UTC (permalink / raw
  To: gentoo-commits

commit:     807bcf83eb8f6e3106f8bac0c8c37265c8db00c8
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:08:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=807bcf83

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] 5+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/ebuild/
@ 2017-09-11 21:43 Brian Dolbec
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2017-09-11 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     42b08308ce0c527fb85bed0a530cc54c5a901121
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: Mon Sep 11 16:13:17 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=42b08308

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] 5+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/ebuild/
@ 2017-11-26 17:46 Brian Dolbec
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2017-11-26 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     2f29a41f0bf42058a6f7c2c44b2eaf779fe9d1e0
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: Sun Nov 26 17:32:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2f29a41f

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] 5+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/ebuild/
@ 2017-12-05 18:32 Brian Dolbec
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2017-12-05 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     5bae7afe1bf95a57a4ec135137a66a4f3047143e
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: Tue Dec  5 18:24:49 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=5bae7afe

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] 5+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/ebuild/
@ 2017-12-06  0:16 Brian Dolbec
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2017-12-06  0:16 UTC (permalink / raw
  To: gentoo-commits

commit:     0e6a9c7e274d9eba6ca98aedb239bf9e7cc8e7f5
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: Wed Dec  6 00:13:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=0e6a9c7e

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] 5+ messages in thread

end of thread, other threads:[~2017-12-06  0:16 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-05 18:32 [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/ebuild/ Brian Dolbec
  -- strict thread matches above, loose matches on Subject: below --
2017-12-06  0:16 Brian Dolbec
2017-11-26 17:46 Brian Dolbec
2017-09-11 21:43 Brian Dolbec
2017-07-15  2:08 Brian Dolbec

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox