]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
admin/build-doc: fix dependency checks 4836/head
authorJohn Spray <john.spray@redhat.com>
Wed, 3 Jun 2015 09:09:09 +0000 (10:09 +0100)
committerJohn Spray <john.spray@redhat.com>
Wed, 3 Jun 2015 09:09:09 +0000 (10:09 +0100)
Fixes: #11857
Signed-off-by: John Spray <john.spray@redhat.com>
admin/build-doc

index f3ebd3402e39bedb3297bd379e19ac0e5383a76b..0b6e88eb81ed5cdadc43ceaf7e8fe030cea0c5d0 100755 (executable)
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-set -e
-
 cd "$(dirname "$0")"
 cd ..
 TOPDIR=`pwd`
@@ -47,6 +45,10 @@ else
     fi
 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