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

commit:     4f73aebefe23704e5758f08f8be3ae130015f271
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 21:42:30 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 22:29:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=4f73aebe

repoman: modules/scan/module.py: Prefix logging messages

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 repoman/pym/repoman/modules/scan/module.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py
index f7f135f73..5424fab65 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/pym/repoman/modules/scan/module.py
@@ -25,10 +25,11 @@ class ModuleConfig(object):
 
 		@param configpaths: ordered list of filepaths to load
 		'''
-		self.configpaths = configpaths
+		self.configpaths = [os.path.join(path, 'repository.yml') for path in configpaths]
+		logging.debug("ModuleConfig; configpaths: %s", self.configpaths)
 
 		self.controller = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
-		logging.debug("module_names: %s", self.controller.module_names)
+		logging.debug("ModuleConfig; module_names: %s", self.controller.module_names)
 
 		self._configs = None
 		self.enabled = []
@@ -41,7 +42,6 @@ class ModuleConfig(object):
 			logging.debug("ModuleConfig; Processing loop %s", loop)
 			setattr(self, '%s_loop' % loop, self._determine_list(loop))
 
-
 	def load_configs(self, configpaths=None):
 		'''load the config files in order'''
 		if configpaths:


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/
@ 2017-07-10 23:01 Brian Dolbec
  0 siblings, 0 replies; 8+ messages in thread
From: Brian Dolbec @ 2017-07-10 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     e06ba56d52350fc043459f56a62ce6434ce7b387
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 21:42:30 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 23:00:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e06ba56d

repoman: modules/scan/module.py: Prefix logging messages

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 repoman/pym/repoman/modules/scan/module.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py
index 8119bcec3..9b6222a6f 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/pym/repoman/modules/scan/module.py
@@ -25,10 +25,11 @@ class ModuleConfig(object):
 
 		@param configpaths: ordered list of filepaths to load
 		'''
-		self.configpaths = configpaths
+		self.configpaths = [os.path.join(path, 'repository.yml') for path in configpaths]
+		logging.debug("ModuleConfig; configpaths: %s", self.configpaths)
 
 		self.controller = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
-		logging.debug("module_names: %s", self.controller.module_names)
+		logging.debug("ModuleConfig; module_names: %s", self.controller.module_names)
 
 		self._configs = None
 		self.enabled = []
@@ -41,7 +42,6 @@ class ModuleConfig(object):
 			logging.debug("ModuleConfig; Processing loop %s", loop)
 			setattr(self, '%s_loop' % loop, self._determine_list(loop))
 
-
 	def load_configs(self, configpaths=None):
 		'''load the config files in order'''
 		if configpaths:


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/
@ 2017-07-15  2:08 Brian Dolbec
  0 siblings, 0 replies; 8+ messages in thread
From: Brian Dolbec @ 2017-07-15  2:08 UTC (permalink / raw
  To: gentoo-commits

commit:     025a6565e69685bf6420246d52b402a6d62ccac1
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 00:11:13 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 02:08:27 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=025a6565

repoman: Update modules/scan/module.py for linechecks config addition

 repoman/pym/repoman/modules/scan/module.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py
index 57ba274a1..ba720386c 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/pym/repoman/modules/scan/module.py
@@ -25,7 +25,7 @@ class ModuleConfig(object):
 
 		@param configpaths: ordered list of filepaths to load
 		'''
-		self.configpaths = [os.path.join(path, 'repository.yml') for path in configpaths]
+		self.configpaths = [os.path.join(path, 'repository.yaml') for path in configpaths]
 		logging.debug("ModuleConfig; configpaths: %s", self.configpaths)
 
 		self.controller = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
@@ -41,13 +41,17 @@ class ModuleConfig(object):
 		for loop in ['pkgs', 'ebuilds', 'final']:
 			logging.debug("ModuleConfig; Processing loop %s", loop)
 			setattr(self, '%s_loop' % loop, self._determine_list(loop))
+		self.linechecks = stack_lists(c['linechecks_modules'].split() for c in self._configs)
 
 	def load_configs(self, configpaths=None):
-		'''load the config files in order'''
+		'''load the config files in order
+
+		@param configpaths: ordered list of filepaths to load
+		'''
 		if configpaths:
 			self.configpaths = configpaths
 		elif not self.configpaths:
-			logging.error("ModuleConfig; Error: No repository.yml files defined")
+			logging.error("ModuleConfig; Error: No repository.yaml files defined")
 		configs = []
 		for path in self.configpaths:
 			logging.debug("ModuleConfig; Processing: %s", path)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/
@ 2017-07-15  2:29 Brian Dolbec
  0 siblings, 0 replies; 8+ messages in thread
From: Brian Dolbec @ 2017-07-15  2:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ad4dedb929b147b19b55e0831d3ff52ce0d6f17d
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 00:11:13 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 02:25:44 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ad4dedb9

repoman: Update modules/scan/module.py for linechecks config addition

 repoman/pym/repoman/modules/scan/module.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py
index 57ba274a1..ba720386c 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/pym/repoman/modules/scan/module.py
@@ -25,7 +25,7 @@ class ModuleConfig(object):
 
 		@param configpaths: ordered list of filepaths to load
 		'''
-		self.configpaths = [os.path.join(path, 'repository.yml') for path in configpaths]
+		self.configpaths = [os.path.join(path, 'repository.yaml') for path in configpaths]
 		logging.debug("ModuleConfig; configpaths: %s", self.configpaths)
 
 		self.controller = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
@@ -41,13 +41,17 @@ class ModuleConfig(object):
 		for loop in ['pkgs', 'ebuilds', 'final']:
 			logging.debug("ModuleConfig; Processing loop %s", loop)
 			setattr(self, '%s_loop' % loop, self._determine_list(loop))
+		self.linechecks = stack_lists(c['linechecks_modules'].split() for c in self._configs)
 
 	def load_configs(self, configpaths=None):
-		'''load the config files in order'''
+		'''load the config files in order
+
+		@param configpaths: ordered list of filepaths to load
+		'''
 		if configpaths:
 			self.configpaths = configpaths
 		elif not self.configpaths:
-			logging.error("ModuleConfig; Error: No repository.yml files defined")
+			logging.error("ModuleConfig; Error: No repository.yaml files defined")
 		configs = []
 		for path in self.configpaths:
 			logging.debug("ModuleConfig; Processing: %s", path)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/
@ 2017-08-17  1:59 Brian Dolbec
  0 siblings, 0 replies; 8+ messages in thread
From: Brian Dolbec @ 2017-08-17  1:59 UTC (permalink / raw
  To: gentoo-commits

commit:     a32f7ffe03fa30f1965627cb950a3db96e115801
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 01:54:27 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 01:57:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a32f7ffe

repoman: Add scan module API compatibility version checking

 repoman/pym/repoman/modules/scan/module.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py
index fc0c66ccb..ac9594a86 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/pym/repoman/modules/scan/module.py
@@ -16,6 +16,7 @@ MODULES_PATH = os.path.dirname(__file__)
 # initial development debug info
 logging.debug("module path: %s", MODULES_PATH)
 
+MODULE_VERSIONS = [1,]
 
 class ModuleConfig(object):
 	'''Holds the scan modules configuration information and
@@ -29,7 +30,10 @@ class ModuleConfig(object):
 		self.configpaths = [os.path.join(path, 'repository.yaml') for path in configpaths]
 		logging.debug("ModuleConfig; configpaths: %s", self.configpaths)
 
-		self.controller = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
+		self.controller = Modules(path=MODULES_PATH,
+								namepath="repoman.modules.scan",
+								compat_versions=MODULE_VERSIONS
+								)
 		logging.debug("ModuleConfig; module_names: %s", self.controller.module_names)
 
 		self._configs = None


^ permalink raw reply related	[flat|nested] 8+ messages in thread

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

commit:     43981e36a7f0f49ecd25c89a341ffe69ff4dd09c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 19:29:26 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 00:13:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=43981e36

repoman scan/module.py: fix typo

 repoman/pym/repoman/modules/scan/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py
index fc0c66ccb..cebc0e708 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/pym/repoman/modules/scan/module.py
@@ -85,7 +85,7 @@ class ModuleConfig(object):
 				if loop in self.controller.get_spec(mod, 'module_runsIn'):
 					mlist.append(mod)
 		except InvalidModuleName:
-			logging.error("ModuleConfig; unkown module: %s, skipping", mod)
+			logging.error("ModuleConfig; unknown module: %s, skipping", mod)
 
 		logging.debug("ModuleConfig; mlist: %s", mlist)
 		return mlist


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/
@ 2018-03-29 21:35 Brian Dolbec
  0 siblings, 0 replies; 8+ messages in thread
From: Brian Dolbec @ 2018-03-29 21:35 UTC (permalink / raw
  To: gentoo-commits

commit:     14f9b7d4d22a223eb54defb29e1fb2adc02fb111
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 19:29:26 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 21:26:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=14f9b7d4

repoman scan/module.py: fix typo

 repoman/pym/repoman/modules/scan/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py
index fc0c66ccb..cebc0e708 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/pym/repoman/modules/scan/module.py
@@ -85,7 +85,7 @@ class ModuleConfig(object):
 				if loop in self.controller.get_spec(mod, 'module_runsIn'):
 					mlist.append(mod)
 		except InvalidModuleName:
-			logging.error("ModuleConfig; unkown module: %s, skipping", mod)
+			logging.error("ModuleConfig; unknown module: %s, skipping", mod)
 
 		logging.debug("ModuleConfig; mlist: %s", mlist)
 		return mlist


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/
@ 2018-03-30  0:48 Brian Dolbec
  0 siblings, 0 replies; 8+ messages in thread
From: Brian Dolbec @ 2018-03-30  0:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d94b56361df9b6ccf27fd325cc50de9a35fac8e8
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 19:29:26 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 00:43:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d94b5636

repoman scan/module.py: fix typo

 repoman/pym/repoman/modules/scan/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py
index fc0c66ccb..cebc0e708 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/pym/repoman/modules/scan/module.py
@@ -85,7 +85,7 @@ class ModuleConfig(object):
 				if loop in self.controller.get_spec(mod, 'module_runsIn'):
 					mlist.append(mod)
 		except InvalidModuleName:
-			logging.error("ModuleConfig; unkown module: %s, skipping", mod)
+			logging.error("ModuleConfig; unknown module: %s, skipping", mod)
 
 		logging.debug("ModuleConfig; mlist: %s", mlist)
 		return mlist


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-03-30  0:49 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-06  0:16 [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/ Brian Dolbec
  -- strict thread matches above, loose matches on Subject: below --
2018-03-30  0:48 Brian Dolbec
2018-03-29 21:35 Brian Dolbec
2017-08-17  1:59 Brian Dolbec
2017-07-15  2:29 Brian Dolbec
2017-07-15  2:08 Brian Dolbec
2017-07-10 23:01 Brian Dolbec
2017-07-10 22:31 Brian Dolbec

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