commit:     a414e92a2b54265105751b43eab5cec8d2308db2
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Nov 14 01:00:24 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 01:00:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a414e92a

sys-cluster/ceph: Fix call to python_fix_shebang in 14.2.1-r1

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 sys-cluster/ceph/ceph-14.2.4-r1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild 
b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
index b5c3ff61473..b56ddd9c3f0 100644
--- a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
@@ -348,8 +348,9 @@ src_install() {
        python_fix_shebang "${ED}"/usr/{,s}bin/
 
        # python_fix_shebang apparently is not idempotent
-       sed -i -r  
's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-               "${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed 
failed"
+       local 
shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+       grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+               | xargs --null --no-run-if-empty -- sed -i -r  
"s:${shebang_regex}:\1:" || die
 
        local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
        dostrip -x "${rados_classes[@]#${ED}}"

Reply via email to