Skip to content
Snippets Groups Projects
Commit 97205cf0 authored by Mathias De Mare's avatar Mathias De Mare
Browse files

packaging: don't use plain 'python' if another python has been specified

Before this change, packaging on CentOS 8 failed because 'python'
is used instead of 'python3'.

Change was tested with:
- make docker-centos7
- make docker-centos8
- make docker-ubuntu-bionic

Differential Revision: https://phab.mercurial-scm.org/D9464
parent d2649781
No related branches found
No related tags found
No related merge requests found
......@@ -56,7 +56,7 @@
exit 1
fi
gethgversion
gethgversion $PYTHONEXE
if [ -z "$type" ] ; then
release=1
......@@ -76,7 +76,7 @@
fi
mkdir -p $RPMBUILDDIR/{SOURCES,BUILD,SRPMS,RPMS}
$HG archive -t tgz $RPMBUILDDIR/SOURCES/mercurial-$version-$release.tar.gz
$PYTHONEXE $HG archive -t tgz $RPMBUILDDIR/SOURCES/mercurial-$version-$release.tar.gz
if [ "$PYTHONVER" ]; then
(
mkdir -p build
......@@ -112,7 +112,7 @@
if echo $version | grep '+' > /dev/null 2>&1; then
latesttag="`echo $version | sed -e 's/+.*//'`"
$HG log -r .:"$latesttag" -fM \
$PYTHONEXE $HG log -r .:"$latesttag" -fM \
--template '{date|hgdate}\t{author}\t{desc|firstline}\n' | python -c '
import sys, time
......@@ -136,5 +136,5 @@
else
$HG log \
$PYTHONEXE $HG log \
--template '{date|hgdate}\t{author}\t{desc|firstline}\n' \
......@@ -140,5 +140,5 @@
--template '{date|hgdate}\t{author}\t{desc|firstline}\n' \
.hgtags | python -c '
.hgtags | $PYTHONEXE -c '
import sys, time
def datestr(date, format):
......
......@@ -8,6 +8,11 @@
#
# node: the node|short hg was built from, or empty if built from a tag
gethgversion() {
if [ -z "${1+x}" ]; then
python="python"
else
python="$1"
fi
export HGRCPATH=
export HGPLAIN=
......@@ -11,7 +16,7 @@
export HGRCPATH=
export HGPLAIN=
make cleanbutpackages
make local PURE=--pure
make cleanbutpackages PYTHON=$python
make local PURE=--pure PYTHON=$python
HG="$PWD/hg"
......@@ -16,4 +21,4 @@
HG="$PWD/hg"
"$HG" version > /dev/null || { echo 'abort: hg version failed!'; exit 1 ; }
$python "$HG" version > /dev/null || { echo 'abort: hg version failed!'; exit 1 ; }
......@@ -19,5 +24,5 @@
hgversion=`LANGUAGE=C "$HG" version | sed -ne 's/.*(version \(.*\))$/\1/p'`
hgversion=`LANGUAGE=C $python "$HG" version | sed -ne 's/.*(version \(.*\))$/\1/p'`
if echo $hgversion | grep + > /dev/null 2>&1 ; then
tmp=`echo $hgversion | cut -d+ -f 2`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment