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 239561388BF for ; Sun, 10 Jan 2016 03:26:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1046621C01E; Sun, 10 Jan 2016 03:26:08 +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 B680421C013 for ; Sun, 10 Jan 2016 03:26:06 +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 D19B13408EA for ; Sun, 10 Jan 2016 03:26:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93177E60 for ; Sun, 10 Jan 2016 03:26:00 +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: <1452396231.89295567960c110468afb5b972583b4c56f7180a.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/, pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/modules/scan/depend/depend.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/modules/scan/depend/ pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 89295567960c110468afb5b972583b4c56f7180a X-VCS-Branch: repoman Date: Sun, 10 Jan 2016 03:26:00 +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: 3e09bb80-6858-41b1-9fe5-31adb623d8d1 X-Archives-Hash: ae26bb59d07ef484de918479a3e60624 commit: 89295567960c110468afb5b972583b4c56f7180a Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 21:19:59 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun Jan 10 03:23:51 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=89295567 repoman: Migrate some additional Dependency code to the plugin pym/repoman/modules/scan/depend/depend.py | 13 ++++++++++++- pym/repoman/scanner.py | 22 +++------------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/pym/repoman/modules/scan/depend/depend.py b/pym/repoman/modules/scan/depend/depend.py index 8a0ff48..7f1d007 100644 --- a/pym/repoman/modules/scan/depend/depend.py +++ b/pym/repoman/modules/scan/depend/depend.py @@ -1,3 +1,5 @@ +# -*- coding:utf-8 -*- + from _emerge.Package import Package @@ -121,7 +123,16 @@ class DependChecks(object): qacat = m + ".syntax" self.qatracker.add_error( qacat, "%s: %s: %s" % (ebuild.relative_path, m, b)) - return {'continue': False, 'unknown_pkgs': unknown_pkgs, 'type_list': type_list} + + # data required for some other tests + badlicsyntax = len([z for z in type_list if z == "LICENSE"]) + badprovsyntax = len([z for z in type_list if z == "PROVIDE"]) + baddepsyntax = len(type_list) != badlicsyntax + badprovsyntax + badlicsyntax = badlicsyntax > 0 + #badprovsyntax = badprovsyntax > 0 + + return {'continue': False, 'unknown_pkgs': unknown_pkgs, 'type_list': type_list, + 'badlicsyntax': badlicsyntax, 'baddepsyntax': baddepsyntax} @property def runInPkgs(self): diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index d42fd33..6d5416b 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -324,26 +324,10 @@ class Scanner(object): if y_ebuild_continue: continue - if dynamic_data['live_ebuild'] and self.repo_settings.repo_config.name == "gentoo": - self.liveeclasscheck.check( - dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild, dynamic_data['ebuild'].keywords, self.repo_metadata['pmaskdict']) - - unknown_pkgs = set() - baddepsyntax = False - badlicsyntax = False - badprovsyntax = False - # catpkg = catdir + "/" + y_ebuild - - badlicsyntax = len([z for z in dynamic_data['type_list'] if z == "LICENSE"]) - badprovsyntax = len([z for z in dynamic_data['type_list'] if z == "PROVIDE"]) - baddepsyntax = len(dynamic_data['type_list']) != badlicsyntax + badprovsyntax - badlicsyntax = badlicsyntax > 0 - badprovsyntax = badprovsyntax > 0 - used_useflags = used_useflags.union(dynamic_data['ebuild_UsedUseFlags']) # license checks - if not badlicsyntax: + if not dynamic_data['badlicsyntax']: self.licensecheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) self.restrictcheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) @@ -449,7 +433,7 @@ class Scanner(object): dep_settings.usemask = dep_settings._use_manager.getUseMask( dynamic_data['pkg'], stable=dep_settings._parent_stable) - if not baddepsyntax: + if not dynamic_data['baddepsyntax']: 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))) @@ -539,7 +523,7 @@ class Scanner(object): % (dynamic_data['ebuild'].relative_path, mytype, keyword, prof, pformat(atoms, indent=6))) - if not baddepsyntax and dynamic_data['unknown_pkgs']: + if not dynamic_data['baddepsyntax'] and dynamic_data['unknown_pkgs']: type_map = {} for mytype, atom in dynamic_data['unknown_pkgs']: type_map.setdefault(mytype, set()).add(atom)