rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

adjust python hashbang in contrib/hg-to-git, it supports python3

Browse Source 
The hg-to-git.py script in contrib grew python3 support in upstream
commit d17ae00c97 (hg-to-git: make it compatible with both python3 and
python2, 2019-09-18), which was released in git-2.24.0.  Move it from
the python2-only conditionals.

(This leaves contrib/fast-import/import-zips.py as the sole python
script which is _not_ python3-compatible.  It seems to need only minimal
fixes for python2/python3 compatibility -- per some light testing.)
This commit is contained in:
Todd Zullinger 2020-10-10 11:23:56 -04:00
parent cdea01ae55
commit 58dc6bb36a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git.spec
View File

@ -634,21 +634,21 @@ export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null)
%if %{with python2}
sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \
contrib/fast-import/import-zips.py \
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
%else
# Remove contrib/fast-import/import-zips.py and contrib/hg-to-git which all
# require python2.
rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git
# Remove contrib/fast-import/import-zips.py which requires python2.
rm -rf contrib/fast-import/import-zips.py
%endif
# endif with python2
# The multimail hook is installed with git. Use python3 to avoid an
# unnecessary python2 dependency, if possible.
# unnecessary python2 dependency, if possible. Also fix contrib/hg-to-git
# while here.
%if %{with python3}
sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
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
@ -1079,6 +1079,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
* Fri Oct 09 2020 Todd Zullinger <tmz@pobox.com> - 2.29.0-0.1.rc1
- update to 2.29.0-rc1
- drop emacs-git stub for fedora >= 34 (#1882360)
- adjust python hashbang in contrib/hg-to-git, it supports python3
* Mon Oct 05 2020 Todd Zullinger <tmz@pobox.com> - 2.29.0-0.0.rc0
- update to 2.29.0-rc0