From d24b9418f8487fa939d5b7bd75b0ba398510e63d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Nov 2017 17:17:22 -0500 Subject: [PATCH] Fix t9020-remote-svn failure when setting PYTHON_PATH In ef7ac1a (git-p4: adjust python2 shebang manually, 2017-08-03) we dropped PYTHON_PATH due to failures in t9020-remote-svn. Digging deeper, the issue appears to be caused by the test calling a script which has a hard-coded #!/usr/bin/python shebang. On newer fedora releases, /usr/bin/python is python3. Replacing the shebang in contrib/svn-fe/svnrdump_sim.py (the script the test calls) with #!%{__python2} allows the test to succeed while setting PYTHON_PATH in config.mak, as desired. --- git.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index 0c35525..8a819de 100644 --- a/git.spec +++ b/git.spec @@ -358,6 +358,7 @@ INSTALL = install -p GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 NO_CROSS_DIRECTORY_HARDLINKS = 1 +PYTHON_PATH = %{__python2} htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} gitwebdir = %{_localstatedir}/www/git @@ -414,7 +415,8 @@ sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ contrib/hg-to-git/hg-to-git.py \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ - contrib/hooks/multimail/post-receive.example + contrib/hooks/multimail/post-receive.example \ + contrib/svn-fe/svnrdump_sim.py %install rm -rf %{buildroot} @@ -448,11 +450,6 @@ make -C contrib/credential/libsecret/ clean install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitcoredir} -# Replace shebang in git-p4. Setting PYTHON_PATH = %{__python2} in config.mak -# should be the way to do this, but that causes the python-based remote svn -# tests in t9020 to fail. -sed -i -e '1s|#!.*python|#!%{__python2}|' %{buildroot}%{gitcoredir}/git-p4 - make -C contrib/subtree install make -C contrib/subtree install-doc @@ -740,6 +737,7 @@ rm -rf %{buildroot} - Drop ancient obsoletes for git and git-arch - Update summary/description of numerous subpackages - Fix shebang in a few places to silence rpmlint complaints +- Fix t9020-remote-svn failure when setting PYTHON_PATH * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0