From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 17 Nov 2015 17:17:05 +0000 (-0600)
Subject: ceph-deploy: use the check_binary_existence method from build_utils.sh
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=194410efe71189111222d0e9883464b19fc3de82;p=ceph-build.git

ceph-deploy: use the check_binary_existence method from build_utils.sh

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

diff --git a/ceph-deploy/build/build b/ceph-deploy/build/build
index a2e8880f..c8eb82dc 100644
--- a/ceph-deploy/build/build
+++ b/ceph-deploy/build/build
@@ -45,13 +45,8 @@ then
         [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
         chacra_endpoint="ceph-deploy/${chacra_ref}/${DISTRO}/${DISTRO_VERSION}"
 
-        $VENV/chacractl exists binaries/${chacra_endpoint}/${ARCH} ; exists=$?
-
-        # if the binary already exists in chacra, do not rebuild
-        if [ $exists -eq 0 ] && [ "$FORCE" = false ] ; then
-            echo "The endpoint at ${chacra_endpoint}/${ARCH} already exists and FORCE was not set, Exiting..."
-            exit 0
-        fi
+        # this exists in scripts/build_utils.sh
+        check_binary_existence $chacra_endpoint/$ARCH
 
         if [ ! -e setup.py ] ; then
             echo "Are we in the right directory"
@@ -93,13 +88,8 @@ then
     [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
     chacra_endpoint="ceph-deploy/${chacra_ref}/${DISTRO}/${DEB_BUILD}/${ARCH}"
 
-    $VENV/chacractl exists binaries/${chacra_endpoint} ; exists=$?
-
-    # if the binary already exists in chacra, do not rebuild
-    if [ $exists -eq 0 ] && [ "$FORCE" = false ] ; then
-        echo "The endpoint at ${chacra_endpoint} already exists and FORCE was not set, Exiting..."
-        exit 0
-    fi
+    # this exists in scripts/build_utils.sh
+    check_binary_existence $chacra_endpoint
 
     if [ ! -d debian ] ; then
         echo "Are we in the right directory"