From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Mc4Eb-0005d3-7U for garchives@archives.gentoo.org; Fri, 14 Aug 2009 21:22:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1DF4E02B2; Fri, 14 Aug 2009 21:22:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 86486E02B2 for ; Fri, 14 Aug 2009 21:22:48 +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 2EE3966C62 for ; Fri, 14 Aug 2009 21:22:48 +0000 (UTC) Received: from arfrever by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Mc4EZ-00012f-I7 for gentoo-commits@lists.gentoo.org; Fri, 14 Aug 2009 21:22:47 +0000 From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, arfrever@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: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis Content-Type: text/plain; charset=utf8 Message-Id: Sender: Arfrever Frehtes Taifersar Arahesis Date: Fri, 14 Aug 2009 21:22:47 +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: 59d5ca86-d9e6-4a0c-ad7f-85f475a6e7f1 X-Archives-Hash: 94b5c2760089fd503f053f092ed4b734 arfrever 09/08/14 21:22:47 Modified: python.eclass Log: Small updates. Revision Changes Path 1.63 eclass/python.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.ecla= ss?rev=3D1.63&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.ecla= ss?rev=3D1.63&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.ecla= ss?r1=3D1.62&r2=3D1.63 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.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- python.eclass 13 Aug 2009 16:57:01 -0000 1.62 +++ python.eclass 14 Aug 2009 21:22:47 -0000 1.63 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.62 2009/08/1= 3 16:57:01 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.63 2009/08/1= 4 21:22:47 arfrever Exp $ =20 # @ECLASS: python.eclass # @MAINTAINER: @@ -113,8 +113,8 @@ # Make sure PYTHON_ABIS variable has valid value. validate_PYTHON_ABIS() { # Ensure that /usr/bin/python and /usr/bin/python-config are valid. - if [[ "$( /dev/null + python${PYVER} -O ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compil= e.py "${myfiles[@]}" &> /dev/null else ewarn "No files to compile!" fi @@ -646,14 +646,14 @@ site_packages_absolute_dirs+=3D("${root}$(python_get_sitedir)/${di= r}") done "$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[= @]}" "${site_packages_absolute_dirs[@]}" || return_code=3D"1" - "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${optio= ns[@]}" "${site_packages_absolute_dirs[@]}" 2> /dev/null || return_code=3D= "1" + "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${optio= ns[@]}" "${site_packages_absolute_dirs[@]}" &> /dev/null || return_code=3D= "1" fi if ((${#site_packages_files[@]})); then for file in "${site_packages_files[@]}"; do site_packages_absolute_files+=3D("${root}$(python_get_sitedir)/${f= ile}") done "$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${site_pac= kages_absolute_files[@]}" || return_code=3D"1" - "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${site_= packages_absolute_files[@]}" 2> /dev/null || return_code=3D"1" + "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${site_= packages_absolute_files[@]}" &> /dev/null || return_code=3D"1" fi eend "${return_code}" fi @@ -668,16 +668,16 @@ ebegin "Compilation and optimization of Python modules placed outside= of site-packages directories for Python ${PYVER}..." if ((${#other_dirs[@]})); then python${PYVER} "${root}$(python_get_libdir)/compileall.py" "${option= s[@]}" "${other_dirs[@]}" || return_code=3D"1" - python${PYVER} -O "${root}$(python_get_libdir)/compileall.py" "${opt= ions[@]}" "${other_dirs[@]}" 2> /dev/null || return_code=3D"1" + python${PYVER} -O "${root}$(python_get_libdir)/compileall.py" "${opt= ions[@]}" "${other_dirs[@]}" &> /dev/null || return_code=3D"1" fi if ((${#other_files[@]})); then python${PYVER} "${root}$(python_get_libdir)/py_compile.py" "${other_= files[@]}" || return_code=3D"1" - python${PYVER} -O "${root}$(python_get_libdir)/py_compile.py" "${oth= er_files[@]}" 2> /dev/null || return_code=3D"1" + python${PYVER} -O "${root}$(python_get_libdir)/py_compile.py" "${oth= er_files[@]}" &> /dev/null || return_code=3D"1" fi eend "${return_code}" fi else - local myroot mydirs=3D() myfiles=3D() myopts=3D() + local myroot mydirs=3D() myfiles=3D() myopts=3D() return_code=3D"0" =20 # strip trailing slash myroot=3D"${ROOT%/}" @@ -725,17 +725,17 @@ if ((${#mydirs[@]})); then python${PYVER} \ "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ - "${myopts[@]}" "${mydirs[@]}" + "${myopts[@]}" "${mydirs[@]}" || return_code=3D"1" python${PYVER} -O \ "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ - "${myopts[@]}" "${mydirs[@]}" 2> /dev/null + "${myopts[@]}" "${mydirs[@]}" &> /dev/null || return_code=3D"1" fi =20 if ((${#myfiles[@]})); then python_mod_compile "${myfiles[@]}" fi =20 - eend $? + eend "${return_code}" fi } =20