| 1 |
commit: 19c812ef2693b64f381869cb7f6ef7e00de218a7 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 3 21:19:59 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=19c812ef |
| 7 |
|
| 8 |
repoman: Migrate some additional Dependency code to the plugin |
| 9 |
|
| 10 |
pym/repoman/modules/scan/depend/depend.py | 13 ++++++++++++- |
| 11 |
pym/repoman/scanner.py | 22 +++------------------- |
| 12 |
2 files changed, 15 insertions(+), 20 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/repoman/modules/scan/depend/depend.py b/pym/repoman/modules/scan/depend/depend.py |
| 15 |
index 8a0ff48..7f1d007 100644 |
| 16 |
--- a/pym/repoman/modules/scan/depend/depend.py |
| 17 |
+++ b/pym/repoman/modules/scan/depend/depend.py |
| 18 |
@@ -1,3 +1,5 @@ |
| 19 |
+# -*- coding:utf-8 -*- |
| 20 |
+ |
| 21 |
|
| 22 |
from _emerge.Package import Package |
| 23 |
|
| 24 |
@@ -121,7 +123,16 @@ class DependChecks(object): |
| 25 |
qacat = m + ".syntax" |
| 26 |
self.qatracker.add_error( |
| 27 |
qacat, "%s: %s: %s" % (ebuild.relative_path, m, b)) |
| 28 |
- return {'continue': False, 'unknown_pkgs': unknown_pkgs, 'type_list': type_list} |
| 29 |
+ |
| 30 |
+ # data required for some other tests |
| 31 |
+ badlicsyntax = len([z for z in type_list if z == "LICENSE"]) |
| 32 |
+ badprovsyntax = len([z for z in type_list if z == "PROVIDE"]) |
| 33 |
+ baddepsyntax = len(type_list) != badlicsyntax + badprovsyntax |
| 34 |
+ badlicsyntax = badlicsyntax > 0 |
| 35 |
+ #badprovsyntax = badprovsyntax > 0 |
| 36 |
+ |
| 37 |
+ return {'continue': False, 'unknown_pkgs': unknown_pkgs, 'type_list': type_list, |
| 38 |
+ 'badlicsyntax': badlicsyntax, 'baddepsyntax': baddepsyntax} |
| 39 |
|
| 40 |
@property |
| 41 |
def runInPkgs(self): |
| 42 |
|
| 43 |
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py |
| 44 |
index 1a2de05..467e6e1 100644 |
| 45 |
--- a/pym/repoman/scanner.py |
| 46 |
+++ b/pym/repoman/scanner.py |
| 47 |
@@ -327,26 +327,10 @@ class Scanner(object): |
| 48 |
if y_ebuild_continue: |
| 49 |
continue |
| 50 |
|
| 51 |
- if dynamic_data['live_ebuild'] and self.repo_settings.repo_config.name == "gentoo": |
| 52 |
- self.liveeclasscheck.check( |
| 53 |
- dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild, dynamic_data['ebuild'].keywords, self.repo_metadata['pmaskdict']) |
| 54 |
- |
| 55 |
- unknown_pkgs = set() |
| 56 |
- baddepsyntax = False |
| 57 |
- badlicsyntax = False |
| 58 |
- badprovsyntax = False |
| 59 |
- # catpkg = catdir + "/" + y_ebuild |
| 60 |
- |
| 61 |
- badlicsyntax = len([z for z in dynamic_data['type_list'] if z == "LICENSE"]) |
| 62 |
- badprovsyntax = len([z for z in dynamic_data['type_list'] if z == "PROVIDE"]) |
| 63 |
- baddepsyntax = len(dynamic_data['type_list']) != badlicsyntax + badprovsyntax |
| 64 |
- badlicsyntax = badlicsyntax > 0 |
| 65 |
- badprovsyntax = badprovsyntax > 0 |
| 66 |
- |
| 67 |
used_useflags = used_useflags.union(dynamic_data['ebuild_UsedUseFlags']) |
| 68 |
|
| 69 |
# license checks |
| 70 |
- if not badlicsyntax: |
| 71 |
+ if not dynamic_data['badlicsyntax']: |
| 72 |
self.licensecheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) |
| 73 |
|
| 74 |
self.restrictcheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) |
| 75 |
@@ -452,7 +436,7 @@ class Scanner(object): |
| 76 |
dep_settings.usemask = dep_settings._use_manager.getUseMask( |
| 77 |
dynamic_data['pkg'], stable=dep_settings._parent_stable) |
| 78 |
|
| 79 |
- if not baddepsyntax: |
| 80 |
+ if not dynamic_data['baddepsyntax']: |
| 81 |
ismasked = not dynamic_data['ebuild'].archs or \ |
| 82 |
dynamic_data['pkg'].cpv not in self.portdb.xmatch("match-visible", |
| 83 |
Atom("%s::%s" % (dynamic_data['pkg'].cp, self.repo_settings.repo_config.name))) |
| 84 |
@@ -542,7 +526,7 @@ class Scanner(object): |
| 85 |
% (dynamic_data['ebuild'].relative_path, mytype, keyword, |
| 86 |
prof, pformat(atoms, indent=6))) |
| 87 |
|
| 88 |
- if not baddepsyntax and dynamic_data['unknown_pkgs']: |
| 89 |
+ if not dynamic_data['baddepsyntax'] and dynamic_data['unknown_pkgs']: |
| 90 |
type_map = {} |
| 91 |
for mytype, atom in dynamic_data['unknown_pkgs']: |
| 92 |
type_map.setdefault(mytype, set()).add(atom) |
Archives