commit: 8ecc34680ea95b2f69242427c040986f76be3a27
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 15:39:40 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 16:51:35 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ecc3468
repoman: Populate module_spec's func_kwargs for all scan modules
First step towards a propoerly controlled module data exchange interface.
pym/repoman/modules/scan/arches/__init__.py | 2 +-
pym/repoman/modules/scan/depend/__init__.py | 10 +++++++---
pym/repoman/modules/scan/directories/__init__.py | 5 +++--
pym/repoman/modules/scan/eapi/__init__.py | 2 +-
pym/repoman/modules/scan/ebuild/__init__.py | 10 +++++++---
pym/repoman/modules/scan/eclasses/__init__.py | 5 +++--
pym/repoman/modules/scan/fetch/__init__.py | 4 +++-
pym/repoman/modules/scan/keywords/__init__.py | 3 ++-
pym/repoman/modules/scan/manifest/__init__.py | 2 +-
pym/repoman/modules/scan/metadata/__init__.py | 16 ++++++++++------
pym/repoman/modules/scan/mirrors/__init__.py | 2 +-
pym/repoman/modules/scan/status/__init__.py | 3 ++-
pym/repoman/modules/scan/use/__init__.py | 4 +++-
13 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/pym/repoman/modules/scan/arches/__init__.py
b/pym/repoman/modules/scan/arches/__init__.py
index b87e07c..e4a4806 100644
--- a/pym/repoman/modules/scan/arches/__init__.py
+++ b/pym/repoman/modules/scan/arches/__init__.py
@@ -20,7 +20,7 @@ module_spec = {
},
'mod_kwargs': ['options', 'repo_settings', 'profiles'
],
- 'func_kwargs': {'ebuild': None,
+ 'func_kwargs': {'ebuild': None, 'arches': 'set',
},
},
}
diff --git a/pym/repoman/modules/scan/depend/__init__.py
b/pym/repoman/modules/scan/depend/__init__.py
index a0f2f9a..a2b8534 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -20,7 +20,9 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'portdb'
],
- 'func_kwargs': {
+ 'func_kwargs': {'ebuild': None, 'pkg': None,
'unknown_pkgs': 'set',
+ 'type_list': [], 'badlicsyntax': 'Future',
+ 'baddepsyntax': 'Future',
},
},
'profile-module': {
@@ -35,7 +37,8 @@ module_spec = {
'repo_settings', 'include_arches', 'caches',
'repoman_incrementals', 'env', 'have',
'dev_keywords'
],
- 'func_kwargs': {
+ 'func_kwargs': {'arches': 'set', 'ebuild': None, 'pkg':
None,
+ 'unknown_pkgs': 'set', 'baddepsyntax': 'Future',
},
},
'unknown-module': {
@@ -48,7 +51,8 @@ module_spec = {
},
'mod_kwargs': ['qatracker',
],
- 'func_kwargs': {
+ 'func_kwargs': {'ebuild': None, 'unknown_pkgs': 'set',
+ 'baddepsyntax': 'Future',
},
},
}
diff --git a/pym/repoman/modules/scan/directories/__init__.py
b/pym/repoman/modules/scan/directories/__init__.py
index d50ace5..0193843 100644
--- a/pym/repoman/modules/scan/directories/__init__.py
+++ b/pym/repoman/modules/scan/directories/__init__.py
@@ -20,7 +20,8 @@ module_spec = {
},
'mod_kwargs': ['portdb', 'qatracker', 'repo_settings',
'vcs_settings',
],
- 'func_kwargs': {
+ 'func_kwargs': {'checkdir': None, 'checkdirlist': None,
+ 'checkdir_relative': None, 'changed': None,
},
},
'mtime-module': {
@@ -33,7 +34,7 @@ module_spec = {
},
'mod_kwargs': ['vcs_settings',
],
- 'func_kwargs': {
+ 'func_kwargs': {'ebuild': None, 'changed': None, 'pkg':
None,
},
},
}
diff --git a/pym/repoman/modules/scan/eapi/__init__.py
b/pym/repoman/modules/scan/eapi/__init__.py
index 63618ab..376e79a 100644
--- a/pym/repoman/modules/scan/eapi/__init__.py
+++ b/pym/repoman/modules/scan/eapi/__init__.py
@@ -20,7 +20,7 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'repo_settings'
],
- 'func_kwargs': {
+ 'func_kwargs': {'ebuild': None,
},
},
}
diff --git a/pym/repoman/modules/scan/ebuild/__init__.py
b/pym/repoman/modules/scan/ebuild/__init__.py
index 9cd49f8..eb9098c 100644
--- a/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/pym/repoman/modules/scan/ebuild/__init__.py
@@ -20,7 +20,8 @@ module_spec = {
},
'mod_kwargs': ['portdb', 'qatracker', 'repo_settings'
],
- 'func_kwargs': {
+ 'func_kwargs': {'checkdirlist': 'list', 'checkdir':
None, 'xpkg': None,
+ 'validity_fuse': None, 'can_force': 'Future',
'pkgs': 'dict',
},
},
'ebuild-module': {
@@ -33,7 +34,10 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'repo_settings',
'vcs_settings', 'checks',
],
- 'func_kwargs': {
+ 'func_kwargs': {'xpkg': None, 'y_ebuild': None,
'changed': None,
+ 'changelog_modified': None, 'pkg': 'Future',
'pkgs': None,
+ 'ebuild': 'Future', 'validity_future': None,
'pkgdir': None,
+ 'repolevel': None, 'catdir': None,
},
},
'multicheck-module': {
@@ -46,7 +50,7 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'options'
],
- 'func_kwargs': {
+ 'func_kwargs': {'ebuild': None, 'pkg': None,
},
},
}
diff --git a/pym/repoman/modules/scan/eclasses/__init__.py
b/pym/repoman/modules/scan/eclasses/__init__.py
index c39589e..7be954c 100644
--- a/pym/repoman/modules/scan/eclasses/__init__.py
+++ b/pym/repoman/modules/scan/eclasses/__init__.py
@@ -20,7 +20,8 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'repo_metadata',
'repo_settings',
],
- 'func_kwargs': {
+ 'func_kwargs': {'live_ebuild': 'set', 'pkg': None,
'xpkg': None,
+ 'ebuild': None, 'y_ebuild': None,
},
},
'ruby-module': {
@@ -33,7 +34,7 @@ module_spec = {
},
'mod_kwargs': ['qatracker'
],
- 'func_kwargs': {
+ 'func_kwargs': {'pkg': None, 'ebuild': None,
},
},
}
diff --git a/pym/repoman/modules/scan/fetch/__init__.py
b/pym/repoman/modules/scan/fetch/__init__.py
index 303eb19..795eabf 100644
--- a/pym/repoman/modules/scan/fetch/__init__.py
+++ b/pym/repoman/modules/scan/fetch/__init__.py
@@ -20,7 +20,9 @@ module_spec = {
},
'mod_kwargs': ['portdb', 'qatracker', 'repo_settings',
'vcs_settings',
],
- 'func_kwargs': {
+ 'func_kwargs': {'xpkg': None, 'checkdir': None,
+ 'checkdir_relative': None, 'changed': None,
+ 'src_uri_error': 'Future',
},
},
}
diff --git a/pym/repoman/modules/scan/keywords/__init__.py
b/pym/repoman/modules/scan/keywords/__init__.py
index 471f447..2d92dba 100644
--- a/pym/repoman/modules/scan/keywords/__init__.py
+++ b/pym/repoman/modules/scan/keywords/__init__.py
@@ -20,7 +20,8 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'options', 'repo_metadata',
'profiles',
],
- 'func_kwargs': {
+ 'func_kwargs': {'pkg': None, 'xpkg': None, 'ebuild':
None,
+ 'y_ebuild': None, 'changed': None,
'live_ebuild': None,
},
},
}
diff --git a/pym/repoman/modules/scan/manifest/__init__.py
b/pym/repoman/modules/scan/manifest/__init__.py
index 4aa80cf..bd9f8da 100644
--- a/pym/repoman/modules/scan/manifest/__init__.py
+++ b/pym/repoman/modules/scan/manifest/__init__.py
@@ -20,7 +20,7 @@ module_spec = {
},
'mod_kwargs': ['options', 'portdb', 'qatracker',
'repo_settings',
],
- 'func_kwargs': {
+ 'func_kwargs': {'checkdir': None, 'xpkg': None,
},
},
}
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index 90981d8..1e690bf 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -20,7 +20,8 @@ module_spec = {
},
'mod_kwargs': ['repo_settings', 'qatracker', 'options',
'metadata_dtd',
],
- 'func_kwargs': {
+ 'func_kwargs': {'xpkg': None, 'checkdir': None,
'checkdirlist': None,
+ 'repolevel': None, 'muselist': 'set',
},
},
'ebuild-metadata': {
@@ -33,7 +34,8 @@ module_spec = {
},
'mod_kwargs': ['qatracker',
],
- 'func_kwargs': {
+ 'func_kwargs': {'ebuild': None, 'catdir': None,
'live_ebuild': None,
+ 'xpkg': None, 'y_ebuild': None,
},
},
'description-metadata': {
@@ -46,7 +48,7 @@ module_spec = {
},
'mod_kwargs': ['qatracker',
],
- 'func_kwargs': {
+ 'func_kwargs': {'ebuild': None, 'pkg': None,
},
},
'license-metadata': {
@@ -59,7 +61,8 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'repo_metadata',
],
- 'func_kwargs': {
+ 'func_kwargs': {'xpkg': None, 'ebuild': None,
'y_ebuild': None,
+ 'badlicsyntax': None,
},
},
'restrict-metadata': {
@@ -72,7 +75,7 @@ module_spec = {
},
'mod_kwargs': ['qatracker',
],
- 'func_kwargs': {
+ 'func_kwargs': {'xpkg': None, 'ebuild': None,
'y_ebuild': None,
},
},
'unused-metadata': {
@@ -85,7 +88,8 @@ module_spec = {
},
'mod_kwargs': ['qatracker',
],
- 'func_kwargs': {
+ 'func_kwargs': {'xpkg': None, 'muselist': None,
'used_useflags': None,
+ 'validity_future': None,
},
},
}
diff --git a/pym/repoman/modules/scan/mirrors/__init__.py
b/pym/repoman/modules/scan/mirrors/__init__.py
index 8ae58b5..1885dca 100644
--- a/pym/repoman/modules/scan/mirrors/__init__.py
+++ b/pym/repoman/modules/scan/mirrors/__init__.py
@@ -20,7 +20,7 @@ module_spec = {
},
'mod_kwargs': ['repo_settings', 'qatracker',
],
- 'func_kwargs': {
+ 'func_kwargs': {'ebuild': None, 'src_uri_error': None,
},
},
}
diff --git a/pym/repoman/modules/scan/status/__init__.py
b/pym/repoman/modules/scan/status/__init__.py
index a5eeb3e..f4683bb 100644
--- a/pym/repoman/modules/scan/status/__init__.py
+++ b/pym/repoman/modules/scan/status/__init__.py
@@ -20,7 +20,8 @@ module_spec = {
},
'mod_kwargs': ['vcs_settings', 'checks',
],
- 'func_kwargs': {
+ 'func_kwargs': {'checkdir': None, 'checkdir_relative':
None,
+ 'xpkg': None, 'eadded': 'Future',
},
},
}
diff --git a/pym/repoman/modules/scan/use/__init__.py
b/pym/repoman/modules/scan/use/__init__.py
index 349980d..f157386 100644
--- a/pym/repoman/modules/scan/use/__init__.py
+++ b/pym/repoman/modules/scan/use/__init__.py
@@ -20,7 +20,9 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'uselist',
],
- 'func_kwargs': {
+ 'func_kwargs': {'pkg': None, 'xpkg': None, 'ebuild':
None,
+ 'y_ebuild': None, 'muselist': None,
'ebuild_UsedUseFlags': 'set',
+ 'used_useflags': None,
},
},
}
