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 CC270198005 for ; Wed, 6 Mar 2013 14:31:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B17B5E0BFA; Wed, 6 Mar 2013 14:31:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4F87E0BFA for ; Wed, 6 Mar 2013 14:31:08 +0000 (UTC) Received: from pomiocik.lan (77-255-31-156.adsl.inetia.pl [77.255.31.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 7A4E633DDF7; Wed, 6 Mar 2013 14:31:06 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-python@lists.gentoo.org Cc: python@gentoo.org, =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-python] [PATCH python-r1] Move validity checks into _python_obtain_impls. Date: Wed, 6 Mar 2013 15:31:34 +0100 Message-Id: <1362580294-3336-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.8.1.5 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Discussions centering around the Python ecosystem in Gentoo Linux X-BeenThere: gentoo-python@gentoo.org X-BeenThere: gentoo-python@lists.gentoo.org X-Archives-Salt: 23e706e4-7782-4d5b-8797-491a409d510a X-Archives-Hash: 51b1c2252d3a9676c2afab62486b076d That is, _python_check_USE_PYTHON and _python_validate_useflags. Those are always used along with per-implementation tasks, so better to have them in _python_obtain_impls than call three functions every time. Also, remove redundant invocation. Note: rebased on multibuild_copy_sources() patch branch. --- gx86/eclass/python-r1.eclass | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gx86/eclass/python-r1.eclass b/gx86/eclass/python-r1.eclass index 36b20dc..9e625f5 100644 --- a/gx86/eclass/python-r1.eclass +++ b/gx86/eclass/python-r1.eclass @@ -357,9 +357,6 @@ python_gen_cond_dep() { python_copy_sources() { debug-print-function ${FUNCNAME} "${@}" - _python_validate_useflags - _python_check_USE_PYTHON - local MULTIBUILD_VARIANTS _python_obtain_impls @@ -579,6 +576,9 @@ _python_check_USE_PYTHON() { # @DESCRIPTION: # Set up the enabled implementation list. _python_obtain_impls() { + _python_validate_useflags + _python_check_USE_PYTHON + MULTIBUILD_VARIANTS=() for impl in "${_PYTHON_ALL_IMPLS[@]}"; do @@ -621,9 +621,6 @@ _python_multibuild_wrapper() { python_foreach_impl() { debug-print-function ${FUNCNAME} "${@}" - _python_validate_useflags - _python_check_USE_PYTHON - local MULTIBUILD_VARIANTS _python_obtain_impls @@ -695,8 +692,6 @@ python_export_best() { python_replicate_script() { debug-print-function ${FUNCNAME} "${@}" - _python_validate_useflags - local suffixes=() _add_suffix() { -- 1.8.1.5