From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 9 Nov 2015 20:13:14 +0000 (-0600)
Subject: use --upgrade when installing chacractl
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9d5e77d186a949410ec802b30bdd5e3f5cdcab5b;p=ceph-build.git

use --upgrade when installing chacractl

This will allow us to not have to change the CHACRACTL_VERSION variable
each time we release a new version of chacractl.

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

diff --git a/ceph-build-next/build/setup b/ceph-build-next/build/setup
index 4ac14309..292cc13e 100644
--- a/ceph-build-next/build/setup
+++ b/ceph-build-next/build/setup
@@ -78,9 +78,9 @@ CHACRACTL_VERSION="chacractl>=0.0.4"
 
 # 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/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION; then
-    $VENV/pip install --exists-action=i --download-directory="$PIP_SDIST_INDEX" $CHACRACTL_VERSION
-    $VENV/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION
+if ! $VENV/pip install --upgrade --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION; then
+    $VENV/pip install --upgrade --exists-action=i --download-directory="$PIP_SDIST_INDEX" $CHACRACTL_VERSION
+    $VENV/pip install --upgrade --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION
 fi
 
 # create the .chacractl config file
diff --git a/ceph-deploy/build/setup b/ceph-deploy/build/setup
index bd7c065e..06f1be77 100644
--- a/ceph-deploy/build/setup
+++ b/ceph-deploy/build/setup
@@ -29,9 +29,9 @@ CHACRACTL_VERSION="chacractl>=0.0.4"
 
 # 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_VERSION; then
-    pip install --exists-action=i --download-directory="$PIP_SDIST_INDEX" $CHACRACTL_VERSION
-    pip install --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION
+if ! pip install --upgrade --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION; then
+    pip install --upgrade --exists-action=i --download-directory="$PIP_SDIST_INDEX" $CHACRACTL_VERSION
+    pip install --upgrade --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION
 fi
 
 # create the .chacractl config file
diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
index 0291106d..468fee57 100644
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -24,9 +24,9 @@ CHACRACTL_VERSION="chacractl>=0.0.4"
 
 # 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/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION; then
-    $VENV/pip install --exists-action=i --download-directory="$PIP_SDIST_INDEX" $CHACRACTL_VERSION
-    $VENV/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION
+if ! $VENV/pip install --upgrade --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION; then
+    $VENV/pip install --upgrade --exists-action=i --download-directory="$PIP_SDIST_INDEX" $CHACRACTL_VERSION
+    $VENV/pip install --upgrade --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION
 fi
 
 # create the .chacractl config file