Mercurial > hg-stable

changeset 43356:5989f697890a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: fix docker-centos5 - use pythonexe and set to "python" as before Fix 92a51a45d44c .
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 01 Nov 2019 12:34:08 +0100
parents 433cdcb37321
children 90dc0d3111d0
files contrib/packaging/buildrpm contrib/packaging/mercurial.spec
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/packaging/buildrpm	Fri Nov 01 12:18:17 2019 +0100
+++ b/contrib/packaging/buildrpm	Fri Nov 01 12:34:08 2019 +0100
@@ -22,6 +22,7 @@
         shift
         PYTHONVER=2.7.16
         PYTHONMD5=f1a2ace631068444831d01485466ece0
+        PYTHONEXE=python
         ;;
     --rpmbuilddir )
         shift
--- a/contrib/packaging/mercurial.spec	Fri Nov 01 12:18:17 2019 +0100
+++ b/contrib/packaging/mercurial.spec	Fri Nov 01 12:34:08 2019 +0100
@@ -2,6 +2,8 @@
 
 %define withpython %{nil}
 
+%global pythonexe python2
+
 %if "%{?withpython}"
 
 %global pythonver %{withpython}
@@ -15,7 +17,6 @@
 
 %else
 
-%global pythonexe python2
 %global pythonver %(%{pythonexe} -c 'import sys;print(".".join(map(str, sys.version_info[:2])))')
 
 %endif