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 154781384B4 for ; Sun, 6 Dec 2015 16:53:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 902F221C047; Sun, 6 Dec 2015 16:53:38 +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 3867D21C047 for ; Sun, 6 Dec 2015 16:53:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3026334082B for ; Sun, 6 Dec 2015 16:53:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD4D8A4B for ; Sun, 6 Dec 2015 16:53:29 +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: <1449420758.b392d99098a4415f5e9207251cdeedd7764f51df.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:python-cleanup-r2 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: b392d99098a4415f5e9207251cdeedd7764f51df X-VCS-Branch: python-cleanup-r2 Date: Sun, 6 Dec 2015 16:53:29 +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: b4f33721-9cc1-4cd7-a9f4-991d59dd127a X-Archives-Hash: 5a1f312a8e606913bfaf324a1ca73588 commit: b392d99098a4415f5e9207251cdeedd7764f51df Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 16:52:38 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 16:52:38 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b392d990 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 9eb2cf0..4b9c6f3 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -391,8 +391,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} )" )