commit: 6661f9725b1fc98fcac45e59d1f41460a5663fe8
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 21:02:33 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 04:08:23 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6661f972
repoman: Complete ruby eclass check migration to the plugin
pym/repoman/modules/scan/eclasses/ruby.py | 13 ++++++++++++-
pym/repoman/scanner.py | 6 ++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/pym/repoman/modules/scan/eclasses/ruby.py
b/pym/repoman/modules/scan/eclasses/ruby.py
index 7a145bc..4f1e640 100644
--- a/pym/repoman/modules/scan/eclasses/ruby.py
+++ b/pym/repoman/modules/scan/eclasses/ruby.py
@@ -16,7 +16,9 @@ class RubyEclassChecks(object):
self.qatracker = kwargs.get('qatracker')
self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
- def check(self, pkg, ebuild):
+ def check(self, **kwargs):
+ pkg = kwargs.get('pkg')
+ ebuild = kwargs.get('ebuild')
is_inherited = lambda eclass: eclass in pkg.inherited
is_old_ruby_eclass_inherited = filter(
is_inherited, self.old_ruby_eclasses)
@@ -30,3 +32,12 @@ class RubyEclassChecks(object):
"IUSE.rubydeprecated",
(ebuild.relative_path + ":
Deprecated ruby target: %s")
% myruby)
+ 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 66aa3fd..11f7d93 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -300,7 +300,7 @@ class Scanner(object):
('thirdpartymirrors', 'ThirdPartyMirrors'),
('description', 'DescriptionChecks'), (None,
'KeywordChecks'),
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
- ('use_flags', 'USEFlagChecks'),
+ ('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -342,9 +342,7 @@ class Scanner(object):
badlicsyntax = badlicsyntax > 0
badprovsyntax = badprovsyntax > 0
- self.rubyeclasscheck =
MODULE_CONTROLLER.get_class('ruby')(**self.kwargs)
-
- self.rubyeclasscheck.check(dynamic_data['pkg'],
dynamic_data['ebuild'])
+ used_useflags =
used_useflags.union(dynamic_data['ebuild_UsedUseFlags'])
# license checks
if not badlicsyntax:
