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 EE6FE13838B for ; Wed, 1 Oct 2014 23:02:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 350C0E089B; Wed, 1 Oct 2014 23:02:42 +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 B0E32E0886 for ; Wed, 1 Oct 2014 23:02:39 +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 2F59D34037E for ; Wed, 1 Oct 2014 23:02:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B5AF6B8A for ; Wed, 1 Oct 2014 23:02:34 +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: <1412204294.4cd224554dd4d6f31cdc1cd610473e71a9d3b76f.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/checks/ebuilds/variables/__init__.py pym/repoman/checks/ebuilds/variables/eapi.py pym/repoman/main.py X-VCS-Directories: pym/repoman/ pym/repoman/checks/ebuilds/variables/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 4cd224554dd4d6f31cdc1cd610473e71a9d3b76f X-VCS-Branch: repoman Date: Wed, 1 Oct 2014 23:02:34 +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: 8bc51a38-1793-43ac-8bbd-d1228b260d72 X-Archives-Hash: fff4b8999070f26bf7ea192a1024bf36 commit: 4cd224554dd4d6f31cdc1cd610473e71a9d3b76f Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 14:40:39 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Wed Oct 1 22:58:14 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4cd22455 repoman/main.py: Split EAPI checks to checks/ebuilds/variables/eapi.py --- pym/repoman/checks/ebuilds/variables/__init__.py | 0 pym/repoman/checks/ebuilds/variables/eapi.py | 44 ++++++++++++++++++++++++ pym/repoman/main.py | 12 +++---- 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py b/pym/repoman/checks/ebuilds/variables/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pym/repoman/checks/ebuilds/variables/eapi.py b/pym/repoman/checks/ebuilds/variables/eapi.py new file mode 100644 index 0000000..2f8b1cb --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/eapi.py @@ -0,0 +1,44 @@ + +'''eapi.py +Perform checks on the EAPI variable. +''' + + +class EAPIChecks(object): + '''Perform checks on the EAPI variable.''' + + def __init__(self, qatracker, repo_settings): + ''' + @param qatracker: QATracker instance + @param repo_settings: Repository settings + ''' + self.qatracker = qatracker + self.repo_settings = repo_settings + + def check(self, pkg, ebuild): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + eapi = pkg._metadata["EAPI"] + + if not self._checkBanned(ebuild, eapi): + self._checkDeprecated(ebuild, eapi) + + def _checkBanned(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_banned(eapi): + self.qatracker.add_error( + "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False + + def _checkDeprecated(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_deprecated(eapi): + self.qatracker.add_error( + "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False diff --git a/pym/repoman/main.py b/pym/repoman/main.py index ecdecfa..c6f38df 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -58,6 +58,7 @@ from repoman.checks.ebuilds.manifests import Manifests from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks +from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -292,6 +293,7 @@ use_flag_checks = USEFlagChecks(qatracker, uselist) keywordcheck = KeywordChecks(qatracker) liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) +eapicheck = EAPIChecks(qatracker, repo_settings) ###################### for xpkg in effective_scanlist: @@ -393,13 +395,9 @@ for xpkg in effective_scanlist: inherited = pkg.inherited live_ebuild = live_eclasses.intersection(inherited) - if repo_settings.repo_config.eapi_is_banned(eapi): - qatracker.add_error( - "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) - - elif repo_settings.repo_config.eapi_is_deprecated(eapi): - qatracker.add_error( - "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + ####################### + eapicheck.check(pkg, ebuild) + ####################### for k, v in myaux.items(): if not isinstance(v, basestring):