From: John Spray <john.spray@redhat.com>
Date: Wed, 3 Jun 2015 09:09:09 +0000 (+0100)
Subject: admin/build-doc: fix dependency checks
X-Git-Tag: v0.94.3~53^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba1a0167cc809081eda7e6cc9ecfb971e439d696;p=ceph.git

admin/build-doc: fix dependency checks

http://tracker.ceph.com/issues/11857 Fixes: #11857

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 539c1ba7211f579bad4f59ae824f1e68e620ecbd)

Conflicts:
	admin/build-doc
            Insert lines at appropriate spot
---

diff --git a/admin/build-doc b/admin/build-doc
index dfbd5e45f0f6..adc623360ab5 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-set -e
-
 cd "$(dirname "$0")"
 cd ..
 TOPDIR=`pwd`
@@ -51,6 +49,10 @@ if [ ! -e build-doc/doxygen/xml ]; then
     doxygen
 fi
 
+# Don't enable -e until after running all the potentially-erroring checks
+# for availability of commands
+set -e
+
 cat src/osd/PG.h src/osd/PG.cc | doc/scripts/gen_state_diagram.py > doc/dev/peering_graph.generated.dot
 
 cd build-doc