From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Mon, 12 Aug 2019 21:00:11 +0000 (+0200)
Subject: build_utils: use virtualenv -p python2.7 instead virtualenv
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2f1b774ba7a704519bf4169f6da66ad6208e16da;p=ceph-build.git

build_utils: use virtualenv -p python2.7 instead virtualenv

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 76b2f3cf..689cd437 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -85,6 +85,15 @@ pip_download() {
     fi
 }
 
+create_virtualenv () {
+    local path=$1
+    if [ "$(ls -A $path)" ]; then
+        echo "Will reuse existing virtual env: $path"
+    else
+        virtualenv -p python2.7 $path
+    fi
+}
+
 install_python_packages_no_binary () {
     # Use this function to create a virtualenv and install python packages
     # without compiling (or using wheels). Pass a list of package names.  If
@@ -96,13 +105,7 @@ install_python_packages_no_binary () {
     #   to_install=( "ansible" "chacractl>=0.0.4" )
     #   install_python_packages_no_binary "to_install[@]"
 
-    # Create the virtualenv
-    if [ "$(ls -A $TEMPVENV)" ]; then
-        echo "Will reuse existing virtual env: $TEMPVENV"
-    else
-        virtualenv $TEMPVENV
-    fi
-
+    create_virtualenv $TEMPVENV
 
     # Define and ensure the PIP cache
     PIP_SDIST_INDEX="$HOME/.cache/pip"
@@ -141,8 +144,7 @@ install_python_packages () {
     #   to_install=( "ansible" "chacractl>=0.0.4" )
     #   install_python_packages "to_install[@]"
 
-    # Create the virtualenv
-    virtualenv $TEMPVENV
+    create_virtualenv $TEMPVENV
 
     # Define and ensure the PIP cache
     PIP_SDIST_INDEX="$HOME/.cache/pip"