Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/
Date: Sun, 06 Dec 2015 17:29:55
Message-Id: 1449422903.ab9fb60042da94b950fc18c379dbb084d64ef592.mgorny@gentoo
1 commit: ab9fb60042da94b950fc18c379dbb084d64ef592
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 6 16:52:38 2015 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 6 17:28:23 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9fb600
7
8 python-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP
9
10 Rename local PYTHON_USEDEP variable to avoid collisions with read-only
11 global variable.
12
13 eclass/python-r1.eclass | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
17 index 22030b9..8c58e31 100644
18 --- a/eclass/python-r1.eclass
19 +++ b/eclass/python-r1.eclass
20 @@ -390,8 +390,8 @@ python_gen_cond_dep() {
21 # (since python_gen_usedep() will not return ${PYTHON_USEDEP}
22 # the code is run at most once)
23 if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
24 - local PYTHON_USEDEP=$(python_gen_usedep "${@}")
25 - dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
26 + local usedep=$(python_gen_usedep "${@}")
27 + dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
28 fi
29
30 matches+=( "python_targets_${impl}? ( ${dep} )" )