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 ED2A558973 for ; Sun, 31 Jan 2016 20:03:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FBDE21C172; Sun, 31 Jan 2016 20:03:40 +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 B499521C171 for ; Sun, 31 Jan 2016 20:03:37 +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 BA9B6340CF8 for ; Sun, 31 Jan 2016 20:03:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D682010FD for ; Sun, 31 Jan 2016 20:03:31 +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: <1454185523.b2aed300f9d0f06a735c9759e7714308b3dfefd8.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/options/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/modules/scan/options/__init__.py pym/repoman/modules/scan/options/options.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/ pym/repoman/modules/scan/options/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b2aed300f9d0f06a735c9759e7714308b3dfefd8 X-VCS-Branch: repoman Date: Sun, 31 Jan 2016 20:03:31 +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: 0d50077f-8c52-419c-a082-fd300149eefd X-Archives-Hash: b7365e3f7024db91a227fe35cbc0ba07 commit: b2aed300f9d0f06a735c9759e7714308b3dfefd8 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 07:55:55 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Jan 30 20:25:23 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b2aed300 repoman: Create a new Options class plugin This handles an options.force bypass using the is_forced() from withing the plugin system. pym/repoman/modules/scan/options/__init__.py | 24 ++++++++++++++++++++++++ pym/repoman/modules/scan/options/options.py | 22 ++++++++++++++++++++++ pym/repoman/scanner.py | 10 ++-------- 3 files changed, 48 insertions(+), 8 deletions(-) diff --git a/pym/repoman/modules/scan/options/__init__.py b/pym/repoman/modules/scan/options/__init__.py new file mode 100644 index 0000000..2d3d9d2 --- /dev/null +++ b/pym/repoman/modules/scan/options/__init__.py @@ -0,0 +1,24 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Options plug-in module for repoman. +Performs option related actions on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'options', + 'description': doc, + 'provides':{ + 'options-module': { + 'name': "options", + 'sourcefile': "options", + 'class': "Options", + 'description': doc, + 'functions': ['is_forced'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/modules/scan/options/options.py b/pym/repoman/modules/scan/options/options.py new file mode 100644 index 0000000..b592884 --- /dev/null +++ b/pym/repoman/modules/scan/options/options.py @@ -0,0 +1,22 @@ + + +class Options(object): + + def __init__(self, **kwargs): + self.options = kwargs.get('options') + + def is_forced(self, **kwargs): + if self.options.force: + # The dep_check() calls are the most expensive QA test. If --force + # is enabled, there's no point in wasting time on these since the + # user is intent on forcing the commit anyway. + return {'continue': True} + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.is_forced]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 78ff053..2625de4 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -291,6 +291,8 @@ class Scanner(object): ('use_flags', 'USEFlagChecks'), ('ruby', 'RubyEclassChecks'), ('license', 'LicenseChecks'), ('restrict', 'RestrictChecks'), ('mtime', 'MtimeChecks'), ('multicheck', 'MultiCheck'), + # Options.is_forced() is used to bypass further checks + ('options', 'Options'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -318,14 +320,6 @@ class Scanner(object): if y_ebuild_continue: continue - # Syntax Checks - - if self.options.force: - # The dep_check() calls are the most expensive QA test. If --force - # is enabled, there's no point in wasting time on these since the - # user is intent on forcing the commit anyway. - continue - relevant_profiles = [] for keyword, arch, groups in dynamic_data['arches']: if arch not in self.profiles: