1 |
commit: fbad4f7dfb991ffd486d26ca4e84cd61aaf62981 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 8 01:37:39 2016 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 06:33:55 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=fbad4f7d |
7 |
|
8 |
repoman: Create USEFlagChecks class plugin |
9 |
|
10 |
pym/repoman/modules/scan/use/__init__.py | 24 +++++++++++++++ |
11 |
.../ebuilds => modules/scan/use}/use_flags.py | 36 ++++++++++++++-------- |
12 |
pym/repoman/scanner.py | 8 ++--- |
13 |
3 files changed, 50 insertions(+), 18 deletions(-) |
14 |
|
15 |
diff --git a/pym/repoman/modules/scan/use/__init__.py b/pym/repoman/modules/scan/use/__init__.py |
16 |
new file mode 100644 |
17 |
index 0000000..80fa213 |
18 |
--- /dev/null |
19 |
+++ b/pym/repoman/modules/scan/use/__init__.py |
20 |
@@ -0,0 +1,24 @@ |
21 |
+# Copyright 2015-2016 Gentoo Foundation |
22 |
+# Distributed under the terms of the GNU General Public License v2 |
23 |
+ |
24 |
+doc = """Use plug-in module for repoman. |
25 |
+Performs use flag checks on ebuilds.""" |
26 |
+__doc__ = doc[:] |
27 |
+ |
28 |
+ |
29 |
+module_spec = { |
30 |
+ 'name': 'use', |
31 |
+ 'description': doc, |
32 |
+ 'provides':{ |
33 |
+ 'use-module': { |
34 |
+ 'name': "use_flags", |
35 |
+ 'sourcefile': "use_flags", |
36 |
+ 'class': "USEFlagChecks", |
37 |
+ 'description': doc, |
38 |
+ 'functions': ['check', 'getUsedUseFlags'], |
39 |
+ 'func_desc': { |
40 |
+ }, |
41 |
+ }, |
42 |
+ } |
43 |
+} |
44 |
+ |
45 |
|
46 |
diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/modules/scan/use/use_flags.py |
47 |
similarity index 74% |
48 |
rename from pym/repoman/checks/ebuilds/use_flags.py |
49 |
rename to pym/repoman/modules/scan/use/use_flags.py |
50 |
index ac21b47..acc7dd3 100644 |
51 |
--- a/pym/repoman/checks/ebuilds/use_flags.py |
52 |
+++ b/pym/repoman/modules/scan/use/use_flags.py |
53 |
@@ -9,31 +9,39 @@ from repoman._portage import portage |
54 |
|
55 |
from portage import eapi |
56 |
from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use |
57 |
+from repoman.modules.scan.scanbase import ScanBase |
58 |
|
59 |
|
60 |
-class USEFlagChecks(object): |
61 |
+class USEFlagChecks(ScanBase): |
62 |
'''Performs checks on USE flags listed in the ebuilds and metadata.xml''' |
63 |
|
64 |
- def __init__(self, qatracker, globalUseFlags): |
65 |
- ''' |
66 |
+ def __init__(self, **kwargs): |
67 |
+ '''Class init |
68 |
+ |
69 |
@param qatracker: QATracker instance |
70 |
@param globalUseFlags: Global USE flags |
71 |
''' |
72 |
- self.qatracker = qatracker |
73 |
- self.globalUseFlags = globalUseFlags |
74 |
+ super(USEFlagChecks, self).__init__(**kwargs) |
75 |
+ self.qatracker = kwargs.get('qatracker') |
76 |
+ self.globalUseFlags = kwargs.get('uselist') |
77 |
self.useFlags = [] |
78 |
self.defaultUseFlags = [] |
79 |
self.usedUseFlags = set() |
80 |
|
81 |
- def check(self, pkg, package, ebuild, y_ebuild, localUseFlags): |
82 |
+ def check(self, **kwargs): |
83 |
'''Perform the check. |
84 |
|
85 |
@param pkg: Package in which we check (object). |
86 |
- @param package: Package in which we check (string). |
87 |
+ @param xpkg: Package in which we check (string). |
88 |
@param ebuild: Ebuild which we check (object). |
89 |
@param y_ebuild: Ebuild which we check (string). |
90 |
- @param localUseFlags: Local USE flags of the package |
91 |
+ @param muselist: Local USE flags of the package |
92 |
''' |
93 |
+ pkg = kwargs.get('pkg') |
94 |
+ package = kwargs.get('xpkg') |
95 |
+ ebuild = kwargs.get('ebuild') |
96 |
+ y_ebuild = kwargs.get('y_ebuild') |
97 |
+ localUseFlags = kwargs.get('muselist') |
98 |
# reset state variables for the run |
99 |
self.useFlags = [] |
100 |
self.defaultUseFlags = [] |
101 |
@@ -41,10 +49,9 @@ class USEFlagChecks(object): |
102 |
self._checkGlobal(pkg) |
103 |
self._checkMetadata(package, ebuild, y_ebuild, localUseFlags) |
104 |
self._checkRequiredUSE(pkg, ebuild) |
105 |
- |
106 |
- def getUsedUseFlags(self): |
107 |
- '''Get the USE flags that this check has seen''' |
108 |
- return self.usedUseFlags |
109 |
+ used_useflags = kwargs.get('used_useflags').union(self.usedUseFlags) |
110 |
+ return {'continue': False, 'ebuild_UsedUseFlags': self.usedUseFlags, |
111 |
+ 'used_useflags': used_useflags} |
112 |
|
113 |
def _checkGlobal(self, pkg): |
114 |
for myflag in pkg._metadata["IUSE"].split(): |
115 |
@@ -88,3 +95,8 @@ class USEFlagChecks(object): |
116 |
"REQUIRED_USE.syntax", |
117 |
"%s: REQUIRED_USE: %s" % (ebuild.relative_path, e)) |
118 |
del e |
119 |
+ |
120 |
+ @property |
121 |
+ def runInEbuilds(self): |
122 |
+ '''Ebuild level scans''' |
123 |
+ return (True, [self.check]) |
124 |
|
125 |
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py |
126 |
index 40aafcc..23642c3 100644 |
127 |
--- a/pym/repoman/scanner.py |
128 |
+++ b/pym/repoman/scanner.py |
129 |
@@ -19,7 +19,6 @@ from portage.dep import Atom |
130 |
from portage.output import green |
131 |
from repoman.checks.ebuilds.checks import run_checks |
132 |
from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks |
133 |
-from repoman.checks.ebuilds.use_flags import USEFlagChecks |
134 |
from repoman.checks.ebuilds.variables.license import LicenseChecks |
135 |
from repoman.checks.ebuilds.variables.restrict import RestrictChecks |
136 |
from repoman.modules.commit import repochecks |
137 |
@@ -215,7 +214,6 @@ class Scanner(object): |
138 |
self.modules[mod_class.__name__] = mod_class(**self.kwargs) |
139 |
|
140 |
# initialize our checks classes here before the big xpkg loop |
141 |
- self.use_flag_checks = USEFlagChecks(self.qatracker, uselist) |
142 |
self.rubyeclasscheck = RubyEclassChecks(self.qatracker) |
143 |
self.licensecheck = LicenseChecks(self.qatracker, liclist, liclist_deprecated) |
144 |
self.restrictcheck = RestrictChecks(self.qatracker) |
145 |
@@ -303,6 +301,7 @@ class Scanner(object): |
146 |
('thirdpartymirrors', 'ThirdPartyMirrors'), |
147 |
('description', 'DescriptionChecks'), (None, 'KeywordChecks'), |
148 |
('arches', 'ArchChecks'), ('depend', 'DependChecks'), |
149 |
+ ('use_flags', 'USEFlagChecks'), |
150 |
]: |
151 |
if mod[0]: |
152 |
mod_class = MODULE_CONTROLLER.get_class(mod[0]) |
153 |
@@ -365,10 +364,7 @@ class Scanner(object): |
154 |
badlicsyntax = badlicsyntax > 0 |
155 |
badprovsyntax = badprovsyntax > 0 |
156 |
|
157 |
- self.use_flag_checks.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild, dynamic_data['muselist']) |
158 |
- |
159 |
- ebuild_used_useflags = self.use_flag_checks.getUsedUseFlags() |
160 |
- used_useflags = used_useflags.union(ebuild_used_useflags) |
161 |
+ used_useflags = used_useflags.union(dynamic_data['ebuild_used_useflags']) |
162 |
|
163 |
self.rubyeclasscheck.check(dynamic_data['pkg'], dynamic_data['ebuild']) |