Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 07/13] python-single-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP
Date: Sun, 06 Dec 2015 19:12:01
Message-Id: 1449428612-20538-8-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCHES] python-r1 suite clean up & impl reorder by "Michał Górny"
1 Rename local PYTHON_USEDEP variable to avoid collisions with read-only
2 global variable.
3 ---
4 eclass/python-single-r1.eclass | 4 ++--
5 1 file changed, 2 insertions(+), 2 deletions(-)
6
7 diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
8 index a89926d..8021501 100644
9 --- a/eclass/python-single-r1.eclass
10 +++ b/eclass/python-single-r1.eclass
11 @@ -388,8 +388,8 @@ python_gen_cond_dep() {
12 # (since python_gen_usedep() will not return ${PYTHON_USEDEP}
13 # the code is run at most once)
14 if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
15 - local PYTHON_USEDEP=$(python_gen_usedep "${@}")
16 - dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
17 + local usedep=$(python_gen_usedep "${@}")
18 + dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
19 fi
20
21 matches+=( "python_single_target_${impl}? ( ${dep} )" )
22 --
23 2.6.3