From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F06F138334 for ; Tue, 18 Sep 2018 17:12:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0283E09C4; Tue, 18 Sep 2018 17:12:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7902AE09C4 for ; Tue, 18 Sep 2018 17:12:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AAF2335CF3 for ; Tue, 18 Sep 2018 17:12:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCA623AA for ; Tue, 18 Sep 2018 17:12:37 +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: <1537290754.0b6ceb56b07e645d7c0374dbe93ae0bec67d85f8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-utils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0b6ceb56b07e645d7c0374dbe93ae0bec67d85f8 X-VCS-Branch: master Date: Tue, 18 Sep 2018 17:12:37 +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: f196bc8a-7699-4010-866b-f8a984df7c34 X-Archives-Hash: 44ef8ec6091076c54c5d071cc15d8339 commit: 0b6ceb56b07e645d7c0374dbe93ae0bec67d85f8 Author: Michał Górny gentoo org> AuthorDate: Tue Sep 18 17:11:16 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Sep 18 17:12:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6ceb56 python-utils-r1.eclass: Revert "Block also pythonX.Y in wrappers" This turned out to be overzealous and broke calling external programs that were using different Python version. Reverts: 7f291f5759959bc338ca0b52b169871f0dccf9a9 eclass/python-utils-r1.eclass | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 6bcbe2e5a09..e3cf82b4b58 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1043,21 +1043,11 @@ python_wrapper_setup() { nonsupp+=( 2to3 python-config "python${pyver}-config" ) fi - # block all other interpreters as incompatible - local orig_EPYTHON=${EPYTHON} local x - for x in "${_PYTHON_ALL_IMPLS[@]}"; do - python_export "${x}" EPYTHON - [[ ${EPYTHON} == ${orig_EPYTHON} ]] && continue - - nonsupp+=( "${EPYTHON}" ) - [[ ${EPYTHON} == python* ]] && nonsupp+=( "${EPYTHON}-config" ) - done - for x in "${nonsupp[@]}"; do cat >"${workdir}"/bin/${x} <<-_EOF_ || die #!/bin/sh - echo "${ECLASS}: ${FUNCNAME}: ${x} is not supported by ${orig_EPYTHON} (PYTHON_COMPAT)" >&2 + echo "${ECLASS}: ${FUNCNAME}: ${x} is not supported by ${EPYTHON} (PYTHON_COMPAT)" >&2 exit 127 _EOF_ chmod +x "${workdir}"/bin/${x} || die