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 0285A1384B4 for ; Sun, 6 Dec 2015 19:09:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E88F421C1DE; Sun, 6 Dec 2015 19:03:54 +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 BB21121C1C2 for ; Sun, 6 Dec 2015 19:03:52 +0000 (UTC) Received: from localhost.localdomain (d202-251.icpnet.pl [109.173.202.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 486DA340862; Sun, 6 Dec 2015 19:03:51 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 11/13] python-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP Date: Sun, 6 Dec 2015 20:03:30 +0100 Message-Id: <1449428612-20538-12-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1449428612-20538-1-git-send-email-mgorny@gentoo.org> References: <1449428612-20538-1-git-send-email-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: af6fc754-3518-4906-b792-2ad09c08f355 X-Archives-Hash: f06c9a67ce941da67d0a031aa62712d0 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} )" ) -- 2.6.3