]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
do not activate a venv when installing chacractl
authorAlfredo Deza <adeza@redhat.com>
Mon, 9 Nov 2015 12:52:25 +0000 (07:52 -0500)
committerAlfredo Deza <adeza@redhat.com>
Mon, 9 Nov 2015 15:00:56 +0000 (10:00 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ceph-build-next/build/setup

index 31bb1441ae72409975c52fad7590f5a7fb3505b6..e972345a077f74c57fa6ca782adac81f2deb8d7b 100644 (file)
@@ -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