From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 27 Dec 2019 09:55:21 +0000 (+0100)
Subject: make-dist: drop Python 2/3 autoselect
X-Git-Tag: v15.1.0~349^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27792%2Fhead;p=ceph.git

make-dist: drop Python 2/3 autoselect

virtualenv will prefer Python 3 over Python 2 if both are available.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/make-dist b/make-dist
index d3ae89f31804..7a6991b4569d 100755
--- a/make-dist
+++ b/make-dist
@@ -68,25 +68,11 @@ download_boost() {
     rm -rf src/boost
 }
 
-_python_autoselect() {
-  python_command=
-  for interpreter in python2.7 python3 ; do
-    type $interpreter > /dev/null 2>&1 || continue
-    python_command=$interpreter
-    break
-  done
-  if [ -z "$python_command" ] ; then
-    echo "Could not find a suitable python interpreter! Bailing out."
-    exit 1
-  fi
-  echo $python_command
-}
-
 build_dashboard_frontend() {
   CURR_DIR=`pwd`
   TEMP_DIR=`mktemp -d`
 
-  $CURR_DIR/src/tools/setup-virtualenv.sh --python=$(_python_autoselect) $TEMP_DIR
+  $CURR_DIR/src/tools/setup-virtualenv.sh $TEMP_DIR
   $TEMP_DIR/bin/pip install nodeenv
   $TEMP_DIR/bin/nodeenv -p --node=10.16.0
   cd src/pybind/mgr/dashboard/frontend