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 45AFE198005 for ; Thu, 21 Feb 2013 22:10:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD271E0212; Thu, 21 Feb 2013 22:10:00 +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 605C5E0212 for ; Thu, 21 Feb 2013 22:10:00 +0000 (UTC) Received: from pomiocik.lan (unknown [213.195.173.220]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 8343833E0DD; Thu, 21 Feb 2013 22:09:58 +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 3/5] Init&finish multijob inside d-r1_run_foreach_impl(). Date: Thu, 21 Feb 2013 23:10:03 +0100 Message-Id: <1361484605-13363-3-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <20130221230724.15b66f86@pomiocik.lan> References: <20130221230724.15b66f86@pomiocik.lan> 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: b7904385-317f-4f90-b7c6-d9f72f2a7614 X-Archives-Hash: b9698c784e5d581cdd537fe1a0eb2bf3 The separate init & finish call was needed before distutils-r1_run_foreach_impl() was introduced. Now it's simpler to call them both inside that function. --- gx86/eclass/distutils-r1.eclass | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass index 8457fd2..adb5d42 100644 --- a/gx86/eclass/distutils-r1.eclass +++ b/gx86/eclass/distutils-r1.eclass @@ -610,7 +610,9 @@ _distutils-r1_run_foreach_impl() { set -- distutils-r1_run_phase "${@}" if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + _distutils-r1_multijob_init python_foreach_impl "${@}" + _distutils-r1_multijob_finish else if [[ ! ${EPYTHON} ]]; then die "EPYTHON unset, python-single-r1_pkg_setup not called?!" @@ -632,19 +634,15 @@ distutils-r1_src_prepare() { distutils-r1_python_prepare_all fi - _distutils-r1_multijob_init if declare -f python_prepare >/dev/null; then _distutils-r1_run_foreach_impl python_prepare fi - _distutils-r1_multijob_finish } distutils-r1_src_configure() { - _distutils-r1_multijob_init if declare -f python_configure >/dev/null; then _distutils-r1_run_foreach_impl python_configure fi - _distutils-r1_multijob_finish if declare -f python_configure_all >/dev/null; then _distutils-r1_run_common_phase python_configure_all @@ -654,13 +652,11 @@ distutils-r1_src_configure() { distutils-r1_src_compile() { debug-print-function ${FUNCNAME} "${@}" - _distutils-r1_multijob_init if declare -f python_compile >/dev/null; then _distutils-r1_run_foreach_impl python_compile else _distutils-r1_run_foreach_impl distutils-r1_python_compile fi - _distutils-r1_multijob_finish if declare -f python_compile_all >/dev/null; then _distutils-r1_run_common_phase python_compile_all @@ -670,11 +666,9 @@ distutils-r1_src_compile() { distutils-r1_src_test() { debug-print-function ${FUNCNAME} "${@}" - _distutils-r1_multijob_init if declare -f python_test >/dev/null; then _distutils-r1_run_foreach_impl python_test fi - _distutils-r1_multijob_finish if declare -f python_test_all >/dev/null; then _distutils-r1_run_common_phase python_test_all @@ -684,13 +678,11 @@ distutils-r1_src_test() { distutils-r1_src_install() { debug-print-function ${FUNCNAME} "${@}" - _distutils-r1_multijob_init if declare -f python_install >/dev/null; then _distutils-r1_run_foreach_impl python_install else _distutils-r1_run_foreach_impl distutils-r1_python_install fi - _distutils-r1_multijob_finish if declare -f python_install_all >/dev/null; then _distutils-r1_run_common_phase python_install_all -- 1.8.1.2