| 1 |
commit: a414e92a2b54265105751b43eab5cec8d2308db2 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Thu Nov 14 01:00:24 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 14 01:00:45 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a414e92a |
| 7 |
|
| 8 |
sys-cluster/ceph: Fix call to python_fix_shebang in 14.2.1-r1 |
| 9 |
|
| 10 |
Copyright: Sony Interactive Entertainment Inc. |
| 11 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-cluster/ceph/ceph-14.2.4-r1.ebuild | 5 +++-- |
| 15 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild |
| 18 |
index b5c3ff61473..b56ddd9c3f0 100644 |
| 19 |
--- a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild |
| 20 |
+++ b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild |
| 21 |
@@ -348,8 +348,9 @@ src_install() { |
| 22 |
python_fix_shebang "${ED}"/usr/{,s}bin/ |
| 23 |
|
| 24 |
# python_fix_shebang apparently is not idempotent |
| 25 |
- sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ |
| 26 |
- "${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed" |
| 27 |
+ local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]' |
| 28 |
+ grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \ |
| 29 |
+ | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die |
| 30 |
|
| 31 |
local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) |
| 32 |
dostrip -x "${rados_classes[@]#${ED}}" |
Archives