diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-04-14 00:10:00 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-04-14 00:10:00 +0000 |
| commit | 76baf378929d617990bf02407291636ad5de8b51 (patch) | |
| tree | abdc1e4d9decbe4003ca50bf9026f721b6cacd89 | |
| parent | Removing ghelm from metadata (diff) | |
| download | gentoo-2-76baf378929d617990bf02407291636ad5de8b51.tar.gz gentoo-2-76baf378929d617990bf02407291636ad5de8b51.tar.bz2 gentoo-2-76baf378929d617990bf02407291636ad5de8b51.zip | |
Remove carriage-return from shebang before validating it, bug 465790 by ikelos.
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8069ba5c8917..e1c19e586601 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.788 2013/04/13 22:49:21 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.789 2013/04/14 00:10:00 floppym Exp $ + + 14 Apr 2013; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass: + Remove carriage-return from shebang before validating it, bug 465790 by + ikelos. 13 Apr 2013; Mike Gilbert <floppym@gentoo.org> systemd.eclass: Replace basename usage with a shell parameter replacement. diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index d9db4cf97126..81e6d59085de 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.21 2013/04/07 17:02:52 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.22 2013/04/14 00:10:00 floppym Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -493,7 +493,7 @@ _python_rewrite_shebang() { local f for f; do - local shebang=$(head -n 1 "${f}") + local shebang=$(head -n 1 "${f}" | sed 's/\r$//') local from debug-print "${FUNCNAME}: path = ${f}" debug-print "${FUNCNAME}: shebang = ${shebang}" |