Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: Mike Gilbert <floppym@g.o>
Subject: [gentoo-dev] [PATCH v3] python-utils-r1.eclass: avoid nested ebegin calls
Date: Mon, 11 Jul 2022 17:14:24
Message-Id: 20220711171349.3458818-1-floppym@gentoo.org
In Reply to: [gentoo-dev] [PATCH v2] python-utils-r1.eclass: avoid nested ebegin calls by Mike Gilbert
1 It's common for python_check_deps to call python_has_version, which
2 calls ebegin itself.
3
4 Closes: https://bugs.gentoo.org/851822
5 Signed-off-by: Mike Gilbert <floppym@g.o>
6 ---
7 eclass/python-utils-r1.eclass | 10 ++++++++--
8 1 file changed, 8 insertions(+), 2 deletions(-)
9
10 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
11 index a18ca58475f..ab59db9954e 100644
12 --- a/eclass/python-utils-r1.eclass
13 +++ b/eclass/python-utils-r1.eclass
14 @@ -1399,9 +1399,15 @@ _python_run_check_deps() {
15
16 local PYTHON_USEDEP="python_targets_${impl}(-)"
17 local PYTHON_SINGLE_USEDEP="python_single_target_${impl}(-)"
18 - ebegin " python_check_deps"
19 + einfo " python_check_deps"
20 python_check_deps
21 - eend ${?}
22 + local status=$?
23 + if [[ ${status} -eq 0 ]]; then
24 + einfo " python_check_deps succeeded"
25 + else
26 + einfo " python_check_deps failed"
27 + fi
28 + return ${status}
29 }
30
31 # @FUNCTION: python_has_version
32 --
33 2.37.0