From 7068fe5993762876430709781f374c010a6e47fd Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Fri, 29 Jan 2016 18:36:31 -0600
Subject: [PATCH] Tweak pyinstaller version selection
---
build-helpers/make-linux-build-docker-inner.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/build-helpers/make-linux-build-docker-inner.sh b/build-helpers/make-linux-build-docker-inner.sh
index 6f8ea5c10..516143788 100755
--- a/build-helpers/make-linux-build-docker-inner.sh
+++ b/build-helpers/make-linux-build-docker-inner.sh
@@ -22,7 +22,15 @@ source .env/bin/activate
curl -k https://ssl.tiker.net/software/ez_setup.py | python -
curl -k https://gitlab.tiker.net/inducer/pip/raw/7.0.3/contrib/get-pip.py | python -
-pip install pyinstaller==3.0 packaging
+pip install packaging
+
+PYTHON_VER=$($PYTHON_EXE -c 'import sys; print(".".join(str(s) for s in sys.version_info[:2]))')
+if test "$PYTHON_VER" = "2.6"; then
+ pip install pyinstaller==2.1
+else
+ pip install pyinstaller
+fi
+
git clone --recursive git://github.com/inducer/loopy
cd loopy
--
GitLab