commit: 2c305a1e3fcfd9c0f46962af3a931a03ea2c5032
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 17:33:26 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 04:08:21 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2c305a1e
repoman: Move ebuild_archs to the Ebuild class
pym/repoman/modules/scan/ebuild/ebuild.py | 2 ++
pym/repoman/scanner.py | 9 ++-------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py
b/pym/repoman/modules/scan/ebuild/ebuild.py
index b0e4996..d8f3118 100644
--- a/pym/repoman/modules/scan/ebuild/ebuild.py
+++ b/pym/repoman/modules/scan/ebuild/ebuild.py
@@ -26,6 +26,7 @@ class Ebuild(object):
self.eapi = None
self.inherited = None
self.keywords = None
+ self.archs = None
def _set_paths(self, **kwargs):
repolevel = kwargs.get('repolevel')
@@ -69,6 +70,7 @@ class Ebuild(object):
self.eapi = self.metadata["EAPI"]
self.inherited = self.pkg.inherited
self.keywords = self.metadata["KEYWORDS"].split()
+ self.archs = set(kw.lstrip("~") for kw in self.keywords if not
kw.startswith("-"))
return {'continue': False}
def bad_split_check(self, **kwargs):
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 20c6460..1f56c5c 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -332,13 +332,8 @@ class Scanner(object):
self.descriptioncheck.check(dynamic_data['pkg'],
dynamic_data['ebuild'])
-
-
- ebuild_archs = set(
- kw.lstrip("~") for kw in
dynamic_data['ebuild'].keywords if not kw.startswith("-"))
-
self.modules['KeywordChecks'].check(
- dynamic_data['pkg'], xpkg,
dynamic_data['ebuild'], y_ebuild, dynamic_data['ebuild'].keywords,
ebuild_archs, self.changed,
+ dynamic_data['pkg'], xpkg,
dynamic_data['ebuild'], y_ebuild, dynamic_data['ebuild'].keywords,
dynamic_data['ebuild'].archs, self.changed,
dynamic_data['live_ebuild'],
self.repo_metadata['kwlist'], self.profiles)
if self.options.ignore_arches:
@@ -618,7 +613,7 @@ class Scanner(object):
dynamic_data['pkg'],
stable=dep_settings._parent_stable)
if not baddepsyntax:
- ismasked = not ebuild_archs or \
+ ismasked = not
dynamic_data['ebuild'].archs or \
dynamic_data['pkg'].cpv not in
self.portdb.xmatch("match-visible",
Atom("%s::%s" %
(dynamic_data['pkg'].cp, self.repo_settings.repo_config.name)))
if ismasked:
