From: Alfredo Deza <adeza@redhat.com>
Date: Mon, 9 Nov 2015 12:52:25 +0000 (-0500)
Subject: do not activate a venv when installing chacractl
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9e83641f95987a5ad1906d57ec4a8121e2451d93;p=ceph-build.git

do not activate a venv when installing chacractl

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-build-next/build/setup b/ceph-build-next/build/setup
index 31bb1441..e972345a 100644
--- a/ceph-build-next/build/setup
+++ b/ceph-build-next/build/setup
@@ -68,7 +68,7 @@ esac
 
 # Create the virtualenv
 virtualenv $WORKSPACE/venv
-source $WORKSPACE/venv/bin/activate
+VENV="$WORKSPACE/venv/bin"
 
 # Define and ensure the PIP cache
 PIP_SDIST_INDEX="$HOME/.cache/pip"
@@ -76,9 +76,9 @@ mkdir -p $PIP_SDIST_INDEX
 
 # Install the package by trying with the cache first, otherwise doing a download only, and then
 # trying to install from the cache again.
-if ! pip install --find-links="file://$PIP_SDIST_INDEX" --no-index chacractl; then
-    pip install --exists-action=i --download-directory="$PIP_SDIST_INDEX" chacractl
-    pip install --find-links="file://$PIP_SDIST_INDEX" --no-index chacractl
+if ! $VENV/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index chacractl; then
+    $VENV/pip install --exists-action=i --download-directory="$PIP_SDIST_INDEX" chacractl
+    $VENV/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index chacractl
 fi
 
 # create the .chacractl config file