diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-09-26 11:58:41 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-09-26 11:58:41 +0000 |
| commit | d7dfb64dfaa835b22de24bc1d290dc5fd04bc737 (patch) | |
| tree | ef26b628b025b43acc681ccf741c76de986df99f /eclass | |
| parent | Version bump, bugfix release for non-fragile ABI (diff) | |
| download | gentoo-2-d7dfb64dfaa835b22de24bc1d290dc5fd04bc737.tar.gz gentoo-2-d7dfb64dfaa835b22de24bc1d290dc5fd04bc737.tar.bz2 gentoo-2-d7dfb64dfaa835b22de24bc1d290dc5fd04bc737.zip | |
Wrap symlinks installed to PYTHON_SCRIPTDIR as well.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 6678be044c0a..e4d71a09a465 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.988 2013/09/26 11:24:30 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.989 2013/09/26 11:58:41 mgorny Exp $ + + 26 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: + Wrap symlinks installed to PYTHON_SCRIPTDIR as well. 26 Sep 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass, python-single-r1.eclass, python-utils-r1.eclass: diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 4cf198482fd9..803a685fbbbd 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-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/distutils-r1.eclass,v 1.82 2013/09/19 17:36:50 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.83 2013/09/26 11:58:41 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -430,6 +430,8 @@ _distutils-r1_wrap_scripts() { local basename=${f##*/} debug-print "${FUNCNAME}: found executable at ${f#${path}/}" + [[ -d ${f} ]] && die "Unexpected directory: ${f}" + local shebang read -r shebang < "${f}" if [[ ${shebang} == '#!'*${EPYTHON}* ]]; then @@ -450,7 +452,7 @@ _distutils-r1_wrap_scripts() { debug-print "${FUNCNAME}: moving to /usr/bin/${basename}" mv "${f}" "${path}${EPREFIX}/usr/bin/${basename}" || die fi - done < <(find "${path}${PYTHON_SCRIPTDIR}" -type f -print0) + done < <(find "${path}${PYTHON_SCRIPTDIR}" -mindepth 1 -print0) } # @FUNCTION: distutils-r1_python_install |