| 1 |
commit: 8f86d04ffd500acb7edb72b8900a8506c6048e1a |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 3 21:55:33 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 30 20:25:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8f86d04f |
| 7 |
|
| 8 |
repoman: Migrate additional dynamic data setting to the USEFlagsChecks |
| 9 |
|
| 10 |
pym/repoman/scanner.py | 6 ++---- |
| 11 |
1 file changed, 2 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py |
| 14 |
index 467e6e1..9b42696 100644 |
| 15 |
--- a/pym/repoman/scanner.py |
| 16 |
+++ b/pym/repoman/scanner.py |
| 17 |
@@ -286,7 +286,7 @@ class Scanner(object): |
| 18 |
def _scan_ebuilds(self, ebuildlist, dynamic_data): |
| 19 |
xpkg = dynamic_data['xpkg'] |
| 20 |
# detect unused local USE-descriptions |
| 21 |
- used_useflags = set() |
| 22 |
+ dynamic_data['used_useflags'] = set() |
| 23 |
|
| 24 |
for y_ebuild in ebuildlist: |
| 25 |
dynamic_data['y_ebuild'] = y_ebuild |
| 26 |
@@ -327,8 +327,6 @@ class Scanner(object): |
| 27 |
if y_ebuild_continue: |
| 28 |
continue |
| 29 |
|
| 30 |
- used_useflags = used_useflags.union(dynamic_data['ebuild_UsedUseFlags']) |
| 31 |
- |
| 32 |
# license checks |
| 33 |
if not dynamic_data['badlicsyntax']: |
| 34 |
self.licensecheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) |
| 35 |
@@ -538,7 +536,7 @@ class Scanner(object): |
| 36 |
# check if there are unused local USE-descriptions in metadata.xml |
| 37 |
# (unless there are any invalids, to avoid noise) |
| 38 |
if dynamic_data['allvalid']: |
| 39 |
- for myflag in dynamic_data['muselist'].difference(used_useflags): |
| 40 |
+ for myflag in dynamic_data['muselist'].difference(dynamic_data['used_useflags']): |
| 41 |
self.qatracker.add_error( |
| 42 |
"metadata.warning", |
| 43 |
"%s/metadata.xml: unused local USE-description: '%s'" |
Archives