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 08CD41384B4 for ; Sun, 6 Dec 2015 19:12:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 934EE21C218; Sun, 6 Dec 2015 19:03:59 +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 6859A21C20D for ; Sun, 6 Dec 2015 19:03:53 +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 EB8373405BB; Sun, 6 Dec 2015 19:03:46 +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 07/13] python-single-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP Date: Sun, 6 Dec 2015 20:03:26 +0100 Message-Id: <1449428612-20538-8-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: 1f1deaf9-e295-4407-9856-f4ad702f550b X-Archives-Hash: c52db6471234b21c6b4996c9b6bf6a44 Rename local PYTHON_USEDEP variable to avoid collisions with read-only global variable. --- eclass/python-single-r1.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index a89926d..8021501 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -388,8 +388,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_single_target_${impl}? ( ${dep} )" ) -- 2.6.3