From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 30 Jul 2015 02:13:39 +0000 (-0600)
Subject: ceph-setup: handle install-deps.sh absence
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a76ae8bd27e87eee0cfb7f87a919e9da027cf65;p=ceph-build.git

ceph-setup: handle install-deps.sh absence

Prior to this commit, if Jenkins could not find ./install-deps.sh in the
tree, the ceph-setup task would fail.

Older versions of Ceph (such as ceph-0.80.8.x) have no install-deps.sh
script. In these cases, simply continue on with the build.
---

diff --git a/ceph-setup/build/build b/ceph-setup/build/build
index a290bea41..edd4d3409 100644
--- a/ceph-setup/build/build
+++ b/ceph-setup/build/build
@@ -32,8 +32,10 @@ rm -rf release
 
 # because autogen+configure will check for dependencies, we are forced to install them
 # and ensure they are present in the current host
-echo "Ensuring dependencies are installed"
-./install-deps.sh
+if [ -x install-deps.sh ]; then
+  echo "Ensuring dependencies are installed"
+  ./install-deps.sh
+fi
 
 # run submodule updates regardless
 echo "Running submodule update ..."