commit: 10c025076814bab93b655bca5557d4c8a717408e Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Mon Jan 4 08:09:33 2016 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Sat Jan 30 07:50:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=10c02507
repoman: Create a new DependUnknown plugin class pym/repoman/modules/scan/depend/__init__.py | 9 +++++++++ pym/repoman/modules/scan/depend/unknown.py | 30 +++++++++++++++++++++++++++++ pym/repoman/scanner.py | 10 +--------- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/pym/repoman/modules/scan/depend/__init__.py b/pym/repoman/modules/scan/depend/__init__.py index cddb7f1..9fd7970 100644 --- a/pym/repoman/modules/scan/depend/__init__.py +++ b/pym/repoman/modules/scan/depend/__init__.py @@ -28,6 +28,15 @@ module_spec = { 'func_desc': { }, }, + 'unknown-module': { + 'name': "unknown", + 'sourcefile': "unknown", + 'class': "DependUnknown", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/depend/unknown.py b/pym/repoman/modules/scan/depend/unknown.py new file mode 100644 index 0000000..61d51b9 --- /dev/null +++ b/pym/repoman/modules/scan/depend/unknown.py @@ -0,0 +1,30 @@ +# -*- coding:utf-8 -*- + + +class DependUnknown(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + baddepsyntax = kwargs.get('baddepsyntax') + unknown_pkgs = kwargs.get('unknown_pkgs') + + if not baddepsyntax and unknown_pkgs: + type_map = {} + for mytype, atom in unknown_pkgs: + type_map.setdefault(mytype, set()).add(atom) + for mytype, atoms in type_map.items(): + self.qatracker.add_error( + "dependency.unknown", "%s: %s: %s" + % (ebuild.relative_path, mytype, ", ".join(sorted(atoms)))) + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 48b60a4..1e61eb6 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -290,6 +290,7 @@ class Scanner(object): ('mtime', 'MtimeChecks'), ('multicheck', 'MultiCheck'), # Options.is_forced() is used to bypass further checks ('options', 'Options'), ('profile', 'ProfileDependsChecks'), + ('unknown', 'DependUnknown'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -317,15 +318,6 @@ class Scanner(object): if y_ebuild_continue: continue - if not dynamic_data['baddepsyntax'] and dynamic_data['unknown_pkgs']: - type_map = {} - for mytype, atom in dynamic_data['unknown_pkgs']: - type_map.setdefault(mytype, set()).add(atom) - for mytype, atoms in type_map.items(): - self.qatracker.add_error( - "dependency.unknown", "%s: %s: %s" - % (dynamic_data['ebuild'].relative_path, mytype, ", ".join(sorted(atoms)))) - # check if there are unused local USE-descriptions in metadata.xml # (unless there are any invalids, to avoid noise) if dynamic_data['allvalid']: