From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass
Date: Sun, 6 Jul 2014 14:41:17 +0000 (UTC) [thread overview]
Message-ID: <20140706144117.33F202004E@flycatcher.gentoo.org> (raw)
mgorny 14/07/06 14:41:17
Modified: ChangeLog python-r1.eclass
Log:
python_gen_cond_dep: delay PYTHON_USEDEP substitution until one of the implementations is actually enabled. Fixes bug #516520.
Revision Changes Path
1.1312 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1312&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1312&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1311&r2=1.1312
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1311
retrieving revision 1.1312
diff -u -r1.1311 -r1.1312
--- ChangeLog 6 Jul 2014 11:45:20 -0000 1.1311
+++ ChangeLog 6 Jul 2014 14:41:17 -0000 1.1312
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1311 2014/07/06 11:45:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1312 2014/07/06 14:41:17 mgorny Exp $
+
+ 06 Jul 2014; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
+ python_gen_cond_dep: delay PYTHON_USEDEP substitution until one of the
+ implementations is actually enabled. Fixes bug #516520.
06 Jul 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Disable python2.6 support and clean up the related code.
1.75 eclass/python-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.74&r2=1.75
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- python-r1.eclass 19 Jun 2014 08:08:10 -0000 1.74
+++ python-r1.eclass 6 Jul 2014 14:41:17 -0000 1.75
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.74 2014/06/19 08:08:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.75 2014/07/06 14:41:17 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -368,17 +368,19 @@
local dep=${1}
shift
- # substitute ${PYTHON_USEDEP} if used
- if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
- local PYTHON_USEDEP=$(python_gen_usedep "${@}")
- dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
- fi
-
for impl in "${PYTHON_COMPAT[@]}"; do
_python_impl_supported "${impl}" || continue
for pattern; do
if [[ ${impl} == ${pattern} ]]; then
+ # substitute ${PYTHON_USEDEP} if used
+ # (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}}
+ fi
+
matches+=( "python_targets_${impl}? ( ${dep} )" )
break
fi
next reply other threads:[~2014-07-06 14:41 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-06 14:41 Michal Gorny (mgorny) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-27 16:31 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass Mike Gilbert (floppym)
2015-07-04 15:22 Manuel Rueger (mrueg)
2015-01-13 21:35 Michal Gorny (mgorny)
2015-01-13 21:34 Michal Gorny (mgorny)
2014-12-28 22:45 Michal Gorny (mgorny)
2014-11-22 2:38 Sebastian Pipping (sping)
2014-08-18 8:56 Michal Gorny (mgorny)
2014-04-19 10:29 Michal Gorny (mgorny)
2014-04-09 21:34 Michal Gorny (mgorny)
2014-04-09 21:20 Michal Gorny (mgorny)
2014-04-09 21:15 Michal Gorny (mgorny)
2014-04-05 20:56 Michal Gorny (mgorny)
2013-12-29 18:19 Michal Gorny (mgorny)
2013-08-27 18:47 Michal Gorny (mgorny)
2013-08-04 8:24 Michal Gorny (mgorny)
2013-03-30 12:56 Mike Gilbert (floppym)
2013-03-20 19:01 Michal Gorny (mgorny)
2013-03-20 19:00 Michal Gorny (mgorny)
2013-03-09 13:52 Michal Gorny (mgorny)
2013-03-09 13:51 Michal Gorny (mgorny)
2013-03-04 19:27 Michal Gorny (mgorny)
2013-02-26 14:35 Michal Gorny (mgorny)
2013-02-26 14:32 Michal Gorny (mgorny)
2013-01-27 16:40 Michal Gorny (mgorny)
2013-01-27 16:36 Michal Gorny (mgorny)
2013-01-04 1:26 Mike Gilbert (floppym)
2012-12-31 13:10 Michal Gorny (mgorny)
2012-12-27 22:56 Michal Gorny (mgorny)
2012-12-19 9:22 Michal Gorny (mgorny)
2012-12-14 8:41 Michal Gorny (mgorny)
2012-11-21 9:04 Michal Gorny (mgorny)
2012-11-21 9:01 Michal Gorny (mgorny)
2012-11-04 15:16 Michal Gorny (mgorny)
2012-11-01 21:43 Michal Gorny (mgorny)
2012-10-29 11:27 Michal Gorny (mgorny)
2012-10-29 9:25 Michal Gorny (mgorny)
2012-10-29 9:22 Michal Gorny (mgorny)
2012-10-27 1:14 Mike Gilbert (floppym)
2012-10-25 16:47 Michal Gorny (mgorny)
2012-10-14 10:51 Michal Gorny (mgorny)
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=20140706144117.33F202004E@flycatcher.gentoo.org \
--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