Patchwork [3,of,8,stable] packaging: fix docker-centos5 - use pythonexe and set to "python" as before

login
register
mail settings
Submitter Mads Kiilerich
Date Nov. 1, 2019, 2:40 p.m.
Message ID <0039dc1d76f454f86a9c.1572619231@madski>
Download mbox | patch
Permalink /patch/42639/
State Accepted
Headers show

Comments

Mads Kiilerich - Nov. 1, 2019, 2:40 p.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1572608048 -3600
#      Fri Nov 01 12:34:08 2019 +0100
# Branch stable
# Node ID 0039dc1d76f454f86a9cbfb9064ca6b3cac664d6
# Parent  b6c904e28f35efa5fcb6162a72e4acb19899f183
packaging: fix docker-centos5 - use pythonexe and set to "python" as before

Fix 92a51a45d44c .

Patch

diff --git a/contrib/packaging/buildrpm b/contrib/packaging/buildrpm
--- a/contrib/packaging/buildrpm
+++ b/contrib/packaging/buildrpm
@@ -22,6 +22,7 @@  while [ "$1" ]; do
         shift
         PYTHONVER=2.7.16
         PYTHONMD5=f1a2ace631068444831d01485466ece0
+        PYTHONEXE=python
         ;;
     --rpmbuilddir )
         shift
diff --git a/contrib/packaging/mercurial.spec b/contrib/packaging/mercurial.spec
--- a/contrib/packaging/mercurial.spec
+++ b/contrib/packaging/mercurial.spec
@@ -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