From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 87C081388C4 for ; Wed, 6 Jan 2016 04:21:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84021E086A; Wed, 6 Jan 2016 04:21:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBCE8E086C for ; Wed, 6 Jan 2016 04:21:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A36B9340A4A for ; Wed, 6 Jan 2016 04:21:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 572A4CFF for ; Wed, 6 Jan 2016 04:21:51 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1452053301.2c305a1e3fcfd9c0f46962af3a931a03ea2c5032.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/, pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/modules/scan/ebuild/ebuild.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/ pym/repoman/modules/scan/ebuild/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 2c305a1e3fcfd9c0f46962af3a931a03ea2c5032 X-VCS-Branch: repoman Date: Wed, 6 Jan 2016 04:21:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d4eaa553-71fa-4271-b150-42b5d6080faf X-Archives-Hash: cfa571b2762f357a34810c9f99974ac5 commit: 2c305a1e3fcfd9c0f46962af3a931a03ea2c5032 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 17:33:26 2016 +0000 Commit: Brian Dolbec gentoo 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: