From 6af873ad53546a375ea25f7d59b6286f69347524 Mon Sep 17 00:00:00 2001
From: Carlos Konstanski <carlos.konstanski@verizonwireless.com>
Date: Fri, 17 Jan 2020 23:06:45 +0000
Subject: detect correct python version for salt

---
 bootstrap/run_salt.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'bootstrap')

diff --git a/bootstrap/run_salt.sh b/bootstrap/run_salt.sh
index 59fd402..3977e9c 100755
--- a/bootstrap/run_salt.sh
+++ b/bootstrap/run_salt.sh
@@ -3,13 +3,27 @@
 working_dir="${1}"
 build_basedir="${2}"
 local_build="${3}"
-python=$(which python3 || false)
 
 salt_running_p() {
     ps -ef | grep -F "salt-call" | grep -v "grep"
     return ${?}
 }
 
+python3_supported=$(python <<EOF
+try:
+    from salt.scripts import salt_call
+    print("success")
+except ImportError:
+    print("fail")
+EOF
+)
+
+if [ "${python3_supported}" == "success" ]; then
+    python=$(which python)
+else
+    python=$(which python2)
+fi
+
 while salt_running_p; do
     sleep 5
 done
-- 
cgit v1.3