From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1KuR8T-0004v0-U1 for garchives@archives.gentoo.org; Mon, 27 Oct 2008 12:23:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5841AE03E5; Mon, 27 Oct 2008 12:23:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 34102E03E5 for ; Mon, 27 Oct 2008 12:23:53 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 9DD3E6477C for ; Mon, 27 Oct 2008 12:23:51 +0000 (UTC) Received: from hawking by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1KuR8Q-0004rP-FW for gentoo-commits@lists.gentoo.org; Mon, 27 Oct 2008 12:23:50 +0000 From: "Ali Polatel (hawking)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hawking@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: python.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: python.eclass X-VCS-Directories: eclass X-VCS-Committer: hawking X-VCS-Committer-Name: Ali Polatel Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ali Polatel Date: Mon, 27 Oct 2008 12:23:50 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: be8647b3-fa37-4ef0-994a-aa912061f0c2 X-Archives-Hash: eac1051006139a9d9b06573464fda267 hawking 08/10/27 12:23:50 Modified: python.eclass Log: Don't call python_version in python_{en,dis}able_pyc because they may b= e called in global scope. Revision Changes Path 1.53 eclass/python.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.ecla= ss?rev=3D1.53&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.ecla= ss?rev=3D1.53&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.ecla= ss?r1=3D1.52&r2=3D1.53 Index: python.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- python.eclass 27 Oct 2008 00:17:28 -0000 1.52 +++ python.eclass 27 Oct 2008 12:23:50 -0000 1.53 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.52 2008/10/2= 7 00:17:28 hawking Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.53 2008/10/2= 7 12:23:50 hawking Exp $ =20 # @ECLASS: python.eclass # @MAINTAINER: @@ -68,12 +68,8 @@ # note: supported by >=3Ddev-lang/python-2.2.3-r3 only. # python_disable_pyc() { - python_version - if [[ ${PYVER/./,} -ge 2,6 ]]; then - export PYTHONDONTWRITEBYTECODE=3D1 - else - export PYTHON_DONTCOMPILE=3D1 - fi + export PYTHONDONTWRITEBYTECODE=3D1 # For 2.6 and above + export PYTHON_DONTCOMPILE=3D1 # For 2.5 and below } =20 # @FUNCTION: python_enable_pyc @@ -81,12 +77,8 @@ # Tells python to automatically recompile modules to .pyc/.pyo if the # timestamps/version stamps change python_enable_pyc() { - python_version - if [[ ${PYVER/./,} -ge 2,6 ]]; then - unset PYTHONDONTWRITEBYTECODE - else - unset PYTHON_DONTCOMPILE - fi + unset PYTHONDONTWRITEBYTECODE + unset PYTHON_DONTCOMPILE } =20 python_disable_pyc