public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/
Date: Sun,  6 Dec 2015 17:29:38 +0000 (UTC)	[thread overview]
Message-ID: <1449422903.ab9fb60042da94b950fc18c379dbb084d64ef592.mgorny@gentoo> (raw)

commit:     ab9fb60042da94b950fc18c379dbb084d64ef592
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 16:52:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:28:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9fb600

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} )" )


             reply	other threads:[~2015-12-06 17:29 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-06 17:29 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-12-09 19:32 [gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/ Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-09 19:32 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 17:29 Michał Górny
2015-12-06 16:53 Michał Górny
2015-12-06 16:15 [gentoo-commits] repo/gentoo:master " Michał Górny
2015-12-06 17:29 ` [gentoo-commits] repo/gentoo:python-cleanup-r2 " Michał Górny
2015-12-06 16:11 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449422903.ab9fb60042da94b950fc18c379dbb084d64ef592.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox