[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/use/

[Brian Dolbec]

commit:     9b15527a60f93de80afb33a729f4e3fc25691f65
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 21:55: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=9b15527a

repoman: Migrate additional dynamic data setting to the USEFlagsChecks

 pym/repoman/modules/scan/use/use_flags.py | 4 +++-
 pym/repoman/scanner.py                    | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/modules/scan/use/use_flags.py 
b/pym/repoman/modules/scan/use/use_flags.py
index df83c1b..e7485b1 100644
--- a/pym/repoman/modules/scan/use/use_flags.py
+++ b/pym/repoman/modules/scan/use/use_flags.py
@@ -46,7 +46,9 @@ class USEFlagChecks(object):
                self._checkGlobal(pkg)
                self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
                self._checkRequiredUSE(pkg, ebuild)
-               return {'continue': False, 'ebuild_UsedUseFlags': 
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():

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 2b0a748..5e42faf 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -287,7 +287,7 @@ class Scanner(object):
        def _scan_ebuilds(self, ebuildlist, dynamic_data):
                xpkg = dynamic_data['xpkg']
                # detect unused local USE-descriptions
-               used_useflags = set()
+               dynamic_data['used_useflags'] = set()
 
                for y_ebuild in ebuildlist:
                        dynamic_data['y_ebuild'] = y_ebuild
@@ -331,9 +331,6 @@ class Scanner(object):
 
                        print("**** finished plugin loop, continuing...")
 
-
-                       used_useflags = 
used_useflags.union(dynamic_data['ebuild_UsedUseFlags'])
-
                        # license checks
                        if not dynamic_data['badlicsyntax']:
                                self.licensecheck.check(dynamic_data['pkg'], 
xpkg, dynamic_data['ebuild'], y_ebuild)
@@ -543,7 +540,7 @@ class Scanner(object):
                # check if there are unused local USE-descriptions in 
metadata.xml
                # (unless there are any invalids, to avoid noise)
                if dynamic_data['allvalid']:
-                       for myflag in 
dynamic_data['muselist'].difference(used_useflags):
+                       for myflag in 
dynamic_data['muselist'].difference(dynamic_data['used_useflags']):
                                self.qatracker.add_error(
                                        "metadata.warning",
                                        "%s/metadata.xml: unused local 
USE-description: '%s'"