From: Andrew Schoen <aschoen@redhat.com>
Date: Fri, 6 Nov 2015 22:47:36 +0000 (-0600)
Subject: fix the chacractl exists call in ceph-build-next and ceph-deploy
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F213%2Fhead;p=ceph-build.git

fix the chacractl exists call in ceph-build-next and ceph-deploy

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

diff --git a/ceph-build-next/build/build_deb b/ceph-build-next/build/build_deb
index 72da8b24..a4fd1112 100644
--- a/ceph-build-next/build/build_deb
+++ b/ceph-build-next/build/build_deb
@@ -36,8 +36,7 @@ vers=`cat ./dist/version`
 distro=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"`
 chacra_endpoint="ceph/${chacra_ref}/${distro}/${DIST}/${ARCH}"
 
-# prevent early exit from a non-zero exit because we use `set -e`
-! chacractl exists binaries/${chacra_endpoint}; exists=$? || true
+chacractl exists binaries/${chacra_endpoint} ; exists=$?
 
 # if the binary already exists in chacra, do not rebuild
 if [ $exists -eq 0 ] && [ "$FORCE" = false ] ; then
diff --git a/ceph-build-next/build/build_rpm b/ceph-build-next/build/build_rpm
index 19b3e8d8..5c7655e9 100644
--- a/ceph-build-next/build/build_rpm
+++ b/ceph-build-next/build/build_rpm
@@ -62,8 +62,7 @@ vers=`cat ./dist/version`
 [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
 chacra_baseurl="ceph/${chacra_ref}/${DISTRO}/${RELEASE}"
 
-# prevent early exit from a non-zero exit because we use `set -e`
-! chacractl exists binaries/${chacra_baseurl}/${ARCH}; exists=$? || true
+chacractl exists binaries/${chacra_baseurl}/${ARCH} ; exists=$?
 
 # if the binary already exists in chacra, do not rebuild
 if [ $exists -eq 0 ] && [ "$FORCE" = false ]; then
diff --git a/ceph-deploy/build/build b/ceph-deploy/build/build
index 0cea9deb..571b165d 100644
--- a/ceph-deploy/build/build
+++ b/ceph-deploy/build/build
@@ -84,8 +84,7 @@ then
         [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
         chacra_endpoint="ceph-deploy/${chacra_ref}/${DISTRO}/${DISTRO_VERSION}"
 
-        # prevent early exit from a non-zero exit because we use `set -e`
-        ! chacractl exists binaries/${chacra_endpoint}/${ARCH} ; exists=$? || true
+        chacractl exists binaries/${chacra_endpoint}/${ARCH} ; exists=$?
 
         # if the binary already exists in chacra, do not rebuild
         if [ $exists -eq 0 ] && [ "$FORCE" = false ] ; then
@@ -133,8 +132,7 @@ then
     [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
     chacra_endpoint="ceph-deploy/${chacra_ref}/${DISTRO}/${DEB_BUILD}/${ARCH}"
 
-    # prevent early exit from a non-zero exit because we use `set -e`
-    ! chacractl exists binaries/${chacra_endpoint} ; exists=$? || true
+    chacractl exists binaries/${chacra_endpoint} ; exists=$?
 
     # if the binary already exists in chacra, do not rebuild
     if [ $exists -eq 0 ] && [ "$FORCE" = false ] ; then