From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 28 Oct 2015 21:44:30 +0000 (-0500)
Subject: missing source when activating the venv
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7fc77ceace29c6b2b84657e9da2262f533d4503d;p=ceph-build.git

missing source when activating the venv

This also fixes the path to pip after have the venv activated

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-build-next/build/setup b/ceph-build-next/build/setup
index 149039d8..31bb1441 100644
--- a/ceph-build-next/build/setup
+++ b/ceph-build-next/build/setup
@@ -68,7 +68,7 @@ esac
 
 # Create the virtualenv
 virtualenv $WORKSPACE/venv
-$WORKSPACE/venv/bin/activate
+source $WORKSPACE/venv/bin/activate
 
 # 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 ! venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index chacractl; then
-    venv/bin/pip install --exists-action=i --download-directory="$PIP_SDIST_INDEX" chacractl
-    venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index chacractl
+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
 fi
 
 # create the .chacractl config file