mgorny 14/05/16 07:54:41 Modified: ChangeLog python-utils-r1.eclass Log: Accept files with already-rewritten shebangs in _python_rewrite_shebang. Necessary for proper python_doscript().
Revision Changes Path 1.1255 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1255&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1255&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1254&r2=1.1255 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1254 retrieving revision 1.1255 diff -u -r1.1254 -r1.1255 --- ChangeLog 15 May 2014 05:18:33 -0000 1.1254 +++ ChangeLog 16 May 2014 07:54:40 -0000 1.1255 @@ -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.1254 2014/05/15 05:18:33 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1255 2014/05/16 07:54:40 mgorny Exp $ + + 16 May 2014; Michał Górny <mgo...@gentoo.org> python-utils-r1.eclass: + Accept files with already-rewritten shebangs in _python_rewrite_shebang. + Necessary for proper python_doscript(). 15 May 2014; Ryan Hill <rh...@gentoo.org> toolchain.eclass: Allow parallel profiledbootstrap in newer versions (bug #508878 by Eric F. 1.55 eclass/python-utils-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.55&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.55&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.54&r2=1.55 Index: python-utils-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- python-utils-r1.eclass 1 May 2014 13:34:02 -0000 1.54 +++ python-utils-r1.eclass 16 May 2014 07:54:40 -0000 1.55 @@ -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-utils-r1.eclass,v 1.54 2014/05/01 13:34:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.55 2014/05/16 07:54:40 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -522,7 +522,10 @@ debug-print "${FUNCNAME}: path = ${f}" debug-print "${FUNCNAME}: shebang = ${shebang}" - if [[ "${shebang} " == *'python '* ]]; then + if [[ "${shebang} " == *"${impl} "* ]]; then + # skip files with correct impl + continue + elif [[ "${shebang} " == *'python '* ]]; then from=python elif [[ "${shebang} " == *'python2 '* ]]; then from=python2
