50dc83
From c7aae487213e464b2ee7a785d752bd8264ceb371 Mon Sep 17 00:00:00 2001
50dc83
From: Hari Gowtham <hgowtham@redhat.com>
50dc83
Date: Thu, 13 Jun 2019 20:12:14 +0530
50dc83
Subject: [PATCH 190/192] Build: removing the hardcoded usage of python3
50dc83
50dc83
Label : DOWNSTREAM ONLY
50dc83
50dc83
Problem: RHEL8 needed python3 so python3 was hardcoded to be used
50dc83
in gluster build. python2 was still being used by RHEL7 machines and
50dc83
when the shebang was redirected to use python3 glusterfind failed.
50dc83
It was not working from 6.0-5 downstream build.
50dc83
50dc83
Fix: revert back to the old mechanism where we check the python version
50dc83
and redirect the python script according to the usage.
50dc83
50dc83
Change-Id: I8dc6c9185b2740e20e4c4d734cc1a9e335e9c449
50dc83
fixes: bz#1719640
50dc83
Signed-off-by: Hari Gowtham <hgowtham@redhat.com>
50dc83
Reviewed-on: https://code.engineering.redhat.com/gerrit/173392
50dc83
Reviewed-by: Kaleb Keithley <kkeithle@redhat.com>
50dc83
Tested-by: RHGS Build Bot <nigelb@redhat.com>
50dc83
Reviewed-by: Aravinda Vishwanathapura Krishna Murthy <avishwan@redhat.com>
50dc83
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
50dc83
---
50dc83
 glusterfs.spec.in | 6 ++++--
50dc83
 1 file changed, 4 insertions(+), 2 deletions(-)
50dc83
50dc83
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
50dc83
index 9c7d7a7..0127e8e 100644
50dc83
--- a/glusterfs.spec.in
50dc83
+++ b/glusterfs.spec.in
50dc83
@@ -722,10 +722,12 @@ GlusterFS Events
50dc83
 
50dc83
 %prep
50dc83
 %setup -q -n %{name}-%{version}%{?prereltag}
50dc83
+%if ( ! %{_usepython3} )
50dc83
 echo "fixing python shebangs..."
50dc83
-for i in `find . -type f -exec bash -c "if file {} | grep 'Python script, ASCII text executable' >/dev/null; then echo {}; fi" ';'`; do
50dc83
-    sed -i -e 's|^#!/usr/bin/python.*|#!%{__python3}|' -e 's|^#!/usr/bin/env python.*|#!%{__python3}|' $i
50dc83
+for f in api events extras geo-replication libglusterfs tools xlators; do
50dc83
+find $f -type f -exec sed -i 's|/usr/bin/python3|/usr/bin/python2|' {} \;
50dc83
 done
50dc83
+%endif
50dc83
 
50dc83
 %build
50dc83
 
50dc83
-- 
50dc83
1.8.3.1
50dc83