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 1BA501384B4 for ; Wed, 9 Dec 2015 20:42:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C0AC21C074; Wed, 9 Dec 2015 20:42:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8121621C03E for ; Wed, 9 Dec 2015 20:42:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3EA32340821 for ; Wed, 9 Dec 2015 20:42:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A445AF50 for ; Wed, 9 Dec 2015 20:42:05 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1449693676.300f6e46c968da2b3594a0c3f99945cf34f29b6f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 300f6e46c968da2b3594a0c3f99945cf34f29b6f X-VCS-Branch: master Date: Wed, 9 Dec 2015 20:42:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 77bdc5c7-eae0-4075-b014-f89d4270b2f1 X-Archives-Hash: d8de3eb7ef70e6c35cc0da9da79ea3d5 commit: 300f6e46c968da2b3594a0c3f99945cf34f29b6f Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 16:52:38 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 9 20:41:16 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300f6e46 python-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP Rename local PYTHON_USEDEP variable to avoid collisions with read-only global variable. eclass/python-r1.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 22030b9..8c58e31 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -390,8 +390,8 @@ python_gen_cond_dep() { # (since python_gen_usedep() will not return ${PYTHON_USEDEP} # the code is run at most once) if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then - local PYTHON_USEDEP=$(python_gen_usedep "${@}") - dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} + local usedep=$(python_gen_usedep "${@}") + dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}} fi matches+=( "python_targets_${impl}? ( ${dep} )" )