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