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 70D9058973 for ; Thu, 21 Jan 2016 19:42:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99D91E085A; Thu, 21 Jan 2016 19:42:26 +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 11F4CE085A for ; Thu, 21 Jan 2016 19:42:25 +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 36BDC340834 for ; Thu, 21 Jan 2016 19:42:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE13F1069 for ; Thu, 21 Jan 2016 19:42:21 +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: <1453404499.ebcae720ecafb57b2a7e60292e8e045951fd1d7a.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/__init__.py pym/repoman/modules/scan/depend/unknown.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/ pym/repoman/modules/scan/depend/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: ebcae720ecafb57b2a7e60292e8e045951fd1d7a X-VCS-Branch: repoman Date: Thu, 21 Jan 2016 19:42:21 +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: b33fca8f-1ded-4c26-a7c5-80b48398e33f X-Archives-Hash: ad509d5140dd404362198e3c67a11dfa commit: ebcae720ecafb57b2a7e60292e8e045951fd1d7a Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 08:09:33 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:19 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ebcae720 repoman: Create a new DependUnknown plugin class pym/repoman/modules/scan/depend/__init__.py | 8 ++++++++ pym/repoman/modules/scan/depend/unknown.py | 30 +++++++++++++++++++++++++++++ pym/repoman/scanner.py | 10 +--------- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/pym/repoman/modules/scan/depend/__init__.py b/pym/repoman/modules/scan/depend/__init__.py index 2dac94b..65555b4 100644 --- a/pym/repoman/modules/scan/depend/__init__.py +++ b/pym/repoman/modules/scan/depend/__init__.py @@ -26,6 +26,14 @@ module_spec = { 'func_desc': { }, }, + 'unknown-module': { + 'name': "unknown", + 'class': "DependUnknown", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/depend/unknown.py b/pym/repoman/modules/scan/depend/unknown.py new file mode 100644 index 0000000..61d51b9 --- /dev/null +++ b/pym/repoman/modules/scan/depend/unknown.py @@ -0,0 +1,30 @@ +# -*- coding:utf-8 -*- + + +class DependUnknown(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + baddepsyntax = kwargs.get('baddepsyntax') + unknown_pkgs = kwargs.get('unknown_pkgs') + + if not baddepsyntax and unknown_pkgs: + type_map = {} + for mytype, atom in unknown_pkgs: + type_map.setdefault(mytype, set()).add(atom) + for mytype, atoms in type_map.items(): + self.qatracker.add_error( + "dependency.unknown", "%s: %s: %s" + % (ebuild.relative_path, mytype, ", ".join(sorted(atoms)))) + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 9223876..1cd37d0 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -289,6 +289,7 @@ class Scanner(object): ('mtime', 'MtimeChecks'), ('multicheck', 'MultiCheck'), # Options.is_forced() is used to bypass further checks ('options', 'Options'), ('profile', 'ProfileDependsChecks'), + ('unknown', 'DependUnknown'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -316,15 +317,6 @@ class Scanner(object): if y_ebuild_continue: continue - 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) - for mytype, atoms in type_map.items(): - self.qatracker.add_error( - "dependency.unknown", "%s: %s: %s" - % (dynamic_data['ebuild'].relative_path, mytype, ", ".join(sorted(atoms)))) - # check if there are unused local USE-descriptions in metadata.xml # (unless there are any invalids, to avoid noise) if dynamic_data['allvalid']: