[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/use/, pym/repoman/, pym/repoman/checks/ebuilds/
commit: 6ea2ec5ff28a2f5ceb242e73f91e32ed241fe9bf Author: Brian Dolbec gentoo org> AuthorDate: Fri Jan 8 01:37:39 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Jan 30 20:25:11 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6ea2ec5f repoman: Create USEFlagChecks class plugin pym/repoman/modules/scan/use/__init__.py | 24 +++ .../ebuilds => modules/scan/use}/use_flags.py | 36 ++ pym/repoman/scanner.py | 8 ++--- 3 files changed, 50 insertions(+), 18 deletions(-) diff --git a/pym/repoman/modules/scan/use/__init__.py b/pym/repoman/modules/scan/use/__init__.py new file mode 100644 index 000..80fa213 --- /dev/null +++ b/pym/repoman/modules/scan/use/__init__.py @@ -0,0 +1,24 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Use plug-in module for repoman. +Performs use flag checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'use', + 'description': doc, + 'provides':{ + 'use-module': { + 'name': "use_flags", + 'sourcefile': "use_flags", + 'class': "USEFlagChecks", + 'description': doc, + 'functions': ['check', 'getUsedUseFlags'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/modules/scan/use/use_flags.py similarity index 74% rename from pym/repoman/checks/ebuilds/use_flags.py rename to pym/repoman/modules/scan/use/use_flags.py index ac21b47..acc7dd3 100644 --- a/pym/repoman/checks/ebuilds/use_flags.py +++ b/pym/repoman/modules/scan/use/use_flags.py @@ -9,31 +9,39 @@ from repoman._portage import portage from portage import eapi from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use +from repoman.modules.scan.scanbase import ScanBase -class USEFlagChecks(object): +class USEFlagChecks(ScanBase): '''Performs checks on USE flags listed in the ebuilds and metadata.xml''' - def __init__(self, qatracker, globalUseFlags): - ''' + def __init__(self, **kwargs): + '''Class init + @param qatracker: QATracker instance @param globalUseFlags: Global USE flags ''' - self.qatracker = qatracker - self.globalUseFlags = globalUseFlags + super(USEFlagChecks, self).__init__(**kwargs) + self.qatracker = kwargs.get('qatracker') + self.globalUseFlags = kwargs.get('uselist') self.useFlags = [] self.defaultUseFlags = [] self.usedUseFlags = set() - def check(self, pkg, package, ebuild, y_ebuild, localUseFlags): + def check(self, **kwargs): '''Perform the check. @param pkg: Package in which we check (object). - @param package: Package in which we check (string). + @param xpkg: Package in which we check (string). @param ebuild: Ebuild which we check (object). @param y_ebuild: Ebuild which we check (string). - @param localUseFlags: Local USE flags of the package + @param muselist: Local USE flags of the package ''' + pkg = kwargs.get('pkg') + package = kwargs.get('xpkg') + ebuild = kwargs.get('ebuild') + y_ebuild = kwargs.get('y_ebuild') + localUseFlags = kwargs.get('muselist') # reset state variables for the run self.useFlags = [] self.defaultUseFlags = [] @@ -41,10 +49,9 @@ class USEFlagChecks(object): self._checkGlobal(pkg) self._checkMetadata(package, ebuild, y_ebuild, localUseFlags) self._checkRequiredUSE(pkg, ebuild) - - def getUsedUseFlags(self): - '''Get the USE flags that this check has seen''' - return self.usedUseFlags + used_useflags = kwargs.get('used_useflags').union(self.usedUseFlags) + return {'continue': False, 'ebuild_UsedUseFlags': self.usedUseFlags, + 'used_useflags': used_useflags} def _checkGlobal(self, pkg): for myflag in pkg._metadata["IUSE"].split(): @@ -88,3 +95,8 @@ class USEFlagChecks(object): "REQUIRED_USE.syntax", "%s: REQUIRED_USE: %s" % (ebuild.relative_path, e)) del e + + @property + def runInEbuilds(self): + '''Ebuild level scans''' + return (True, [self.check]) diff --git a/pym/repoman/scanner.py
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/use/, pym/repoman/, pym/repoman/checks/ebuilds/
commit: 5b75b50cb1b03b631c759eb3a05f23b83470f3d3 Author: Brian Dolbec gentoo org> AuthorDate: Fri Jan 8 01:37:39 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Jan 11 08:00:16 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5b75b50c repoman: Create USEFlagChecks class plugin pym/repoman/modules/scan/use/__init__.py | 23 ++ .../ebuilds => modules/scan/use}/use_flags.py | 36 ++ pym/repoman/scanner.py | 8 ++--- 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/pym/repoman/modules/scan/use/__init__.py b/pym/repoman/modules/scan/use/__init__.py new file mode 100644 index 000..e400719 --- /dev/null +++ b/pym/repoman/modules/scan/use/__init__.py @@ -0,0 +1,23 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Use plug-in module for repoman. +Performs use flag checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'use', + 'description': doc, + 'provides':{ + 'use-module': { + 'name': "use_flags", + 'class': "USEFlagChecks", + 'description': doc, + 'functions': ['check', 'getUsedUseFlags'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/modules/scan/use/use_flags.py similarity index 74% rename from pym/repoman/checks/ebuilds/use_flags.py rename to pym/repoman/modules/scan/use/use_flags.py index ac21b47..acc7dd3 100644 --- a/pym/repoman/checks/ebuilds/use_flags.py +++ b/pym/repoman/modules/scan/use/use_flags.py @@ -9,31 +9,39 @@ from repoman._portage import portage from portage import eapi from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use +from repoman.modules.scan.scanbase import ScanBase -class USEFlagChecks(object): +class USEFlagChecks(ScanBase): '''Performs checks on USE flags listed in the ebuilds and metadata.xml''' - def __init__(self, qatracker, globalUseFlags): - ''' + def __init__(self, **kwargs): + '''Class init + @param qatracker: QATracker instance @param globalUseFlags: Global USE flags ''' - self.qatracker = qatracker - self.globalUseFlags = globalUseFlags + super(USEFlagChecks, self).__init__(**kwargs) + self.qatracker = kwargs.get('qatracker') + self.globalUseFlags = kwargs.get('uselist') self.useFlags = [] self.defaultUseFlags = [] self.usedUseFlags = set() - def check(self, pkg, package, ebuild, y_ebuild, localUseFlags): + def check(self, **kwargs): '''Perform the check. @param pkg: Package in which we check (object). - @param package: Package in which we check (string). + @param xpkg: Package in which we check (string). @param ebuild: Ebuild which we check (object). @param y_ebuild: Ebuild which we check (string). - @param localUseFlags: Local USE flags of the package + @param muselist: Local USE flags of the package ''' + pkg = kwargs.get('pkg') + package = kwargs.get('xpkg') + ebuild = kwargs.get('ebuild') + y_ebuild = kwargs.get('y_ebuild') + localUseFlags = kwargs.get('muselist') # reset state variables for the run self.useFlags = [] self.defaultUseFlags = [] @@ -41,10 +49,9 @@ class USEFlagChecks(object): self._checkGlobal(pkg) self._checkMetadata(package, ebuild, y_ebuild, localUseFlags) self._checkRequiredUSE(pkg, ebuild) - - def getUsedUseFlags(self): - '''Get the USE flags that this check has seen''' - return self.usedUseFlags + used_useflags = kwargs.get('used_useflags').union(self.usedUseFlags) + return {'continue': False, 'ebuild_UsedUseFlags': self.usedUseFlags, + 'used_useflags': used_useflags} def _checkGlobal(self, pkg): for myflag in pkg._metadata["IUSE"].split(): @@ -88,3 +95,8 @@ class USEFlagChecks(object): "REQUIRED_USE.syntax", "%s: REQUIRED_USE: %s" % (ebuild.relative_path, e)) del e + + @property + def runInEbuilds(self): + '''Ebuild level scans''' + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 7f770c3..0227a93 100644 ---
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/use/, pym/repoman/, pym/repoman/checks/ebuilds/
commit: 579b15fcc854b1bd10f087af41c9b10ec6e252c1 Author: Brian Dolbec gentoo org> AuthorDate: Fri Jan 8 01:37:39 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Jan 10 03:23:50 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=579b15fc repoman: Create USEFlagChecks class plugin pym/repoman/modules/scan/use/__init__.py | 23 ++ .../ebuilds => modules/scan/use}/use_flags.py | 36 ++ pym/repoman/scanner.py | 8 ++--- 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/pym/repoman/modules/scan/use/__init__.py b/pym/repoman/modules/scan/use/__init__.py new file mode 100644 index 000..e400719 --- /dev/null +++ b/pym/repoman/modules/scan/use/__init__.py @@ -0,0 +1,23 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Use plug-in module for repoman. +Performs use flag checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'use', + 'description': doc, + 'provides':{ + 'use-module': { + 'name': "use_flags", + 'class': "USEFlagChecks", + 'description': doc, + 'functions': ['check', 'getUsedUseFlags'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/modules/scan/use/use_flags.py similarity index 74% rename from pym/repoman/checks/ebuilds/use_flags.py rename to pym/repoman/modules/scan/use/use_flags.py index ac21b47..acc7dd3 100644 --- a/pym/repoman/checks/ebuilds/use_flags.py +++ b/pym/repoman/modules/scan/use/use_flags.py @@ -9,31 +9,39 @@ from repoman._portage import portage from portage import eapi from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use +from repoman.modules.scan.scanbase import ScanBase -class USEFlagChecks(object): +class USEFlagChecks(ScanBase): '''Performs checks on USE flags listed in the ebuilds and metadata.xml''' - def __init__(self, qatracker, globalUseFlags): - ''' + def __init__(self, **kwargs): + '''Class init + @param qatracker: QATracker instance @param globalUseFlags: Global USE flags ''' - self.qatracker = qatracker - self.globalUseFlags = globalUseFlags + super(USEFlagChecks, self).__init__(**kwargs) + self.qatracker = kwargs.get('qatracker') + self.globalUseFlags = kwargs.get('uselist') self.useFlags = [] self.defaultUseFlags = [] self.usedUseFlags = set() - def check(self, pkg, package, ebuild, y_ebuild, localUseFlags): + def check(self, **kwargs): '''Perform the check. @param pkg: Package in which we check (object). - @param package: Package in which we check (string). + @param xpkg: Package in which we check (string). @param ebuild: Ebuild which we check (object). @param y_ebuild: Ebuild which we check (string). - @param localUseFlags: Local USE flags of the package + @param muselist: Local USE flags of the package ''' + pkg = kwargs.get('pkg') + package = kwargs.get('xpkg') + ebuild = kwargs.get('ebuild') + y_ebuild = kwargs.get('y_ebuild') + localUseFlags = kwargs.get('muselist') # reset state variables for the run self.useFlags = [] self.defaultUseFlags = [] @@ -41,10 +49,9 @@ class USEFlagChecks(object): self._checkGlobal(pkg) self._checkMetadata(package, ebuild, y_ebuild, localUseFlags) self._checkRequiredUSE(pkg, ebuild) - - def getUsedUseFlags(self): - '''Get the USE flags that this check has seen''' - return self.usedUseFlags + used_useflags = kwargs.get('used_useflags').union(self.usedUseFlags) + return {'continue': False, 'ebuild_UsedUseFlags': self.usedUseFlags, + 'used_useflags': used_useflags} def _checkGlobal(self, pkg): for myflag in pkg._metadata["IUSE"].split(): @@ -88,3 +95,8 @@ class USEFlagChecks(object): "REQUIRED_USE.syntax", "%s: REQUIRED_USE: %s" % (ebuild.relative_path, e)) del e + + @property + def runInEbuilds(self): + '''Ebuild level scans''' + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 7f770c3..0227a93 100644 ---