代码拉取完成,页面将自动刷新
From c7aae487213e464b2ee7a785d752bd8264ceb371 Mon Sep 17 00:00:00 2001
From: Hari Gowtham <[email protected]>
Date: Thu, 13 Jun 2019 20:12:14 +0530
Subject: [PATCH 190/192] Build: removing the hardcoded usage of python3
Label : DOWNSTREAM ONLY
Problem: RHEL8 needed python3 so python3 was hardcoded to be used
in gluster build. python2 was still being used by RHEL7 machines and
when the shebang was redirected to use python3 glusterfind failed.
It was not working from 6.0-5 downstream build.
Fix: revert back to the old mechanism where we check the python version
and redirect the python script according to the usage.
Change-Id: I8dc6c9185b2740e20e4c4d734cc1a9e335e9c449
fixes: bz#1719640
Signed-off-by: Hari Gowtham <[email protected]>
Reviewed-on: https://code.engineering.redhat.com/gerrit/173392
Reviewed-by: Kaleb Keithley <[email protected]>
Tested-by: RHGS Build Bot <[email protected]>
Reviewed-by: Aravinda Vishwanathapura Krishna Murthy <[email protected]>
Reviewed-by: Atin Mukherjee <[email protected]>
---
glusterfs.spec.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 9c7d7a7..0127e8e 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -722,10 +722,12 @@ GlusterFS Events
%prep
%setup -q -n %{name}-%{version}%{?prereltag}
+%if ( ! %{_usepython3} )
echo "fixing python shebangs..."
-for i in `find . -type f -exec bash -c "if file {} | grep 'Python script, ASCII text executable' >/dev/null; then echo {}; fi" ';'`; do
- sed -i -e 's|^#!/usr/bin/python.*|#!%{__python3}|' -e 's|^#!/usr/bin/env python.*|#!%{__python3}|' $i
+for f in api events extras geo-replication libglusterfs tools xlators; do
+find $f -type f -exec sed -i 's|/usr/bin/python3|/usr/bin/python2|' {} \;
done
+%endif
%build
--
1.8.3.1
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。