commit e32526d146946fae629baa050be6f3ea495392f9
author Jenkins <jenkins@review.openstack.org> Tue Jun 17 19:44:30 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jun 17 19:44:30 2014 +0000
tree 113f07a790c07fc557c79513338061f6c33aa8ef
parent 7c5a02c48c253c592069d7dbe405a50ed76efa4b
parent 54e3910f2d2b2dc49719c7c2f1dca1abb6481870

Merge "Add basic echo_* functions for grenade"

functions

diff --git a/functions b/functions
index 80f98ad..543a6fe 100644
--- a/functions
+++ b/functions
@@ -16,6 +16,10 @@
 XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
+# Check if a function already exists
+function function_exists {
+    declare -f -F $1 > /dev/null
+}
 
 # Checks if installed Apache is <= given version
 # $1 = x.y.z (version string of Apache)
@@ -527,6 +531,20 @@
     iniset $conf_file $conf_section logging_exception_prefix "%(color)s%(asctime)s.%(msecs)03d TRACE %(name)s %(instance)s"
 }
 
+# These functions are provided for basic fall-back functionality for
+# projects that include parts of devstack (grenade).  stack.sh will
+# override these with more specific versions for devstack (with fancy
+# spinners, etc).  We never override an existing version
+if ! function_exists echo_summary; then
+    function echo_summary {
+        echo $@
+    }
+fi
+if ! function_exists echo_nolog; then
+    function echo_nolog {
+        echo $@
+    }
+fi
 
 # Restore xtrace
 $XTRACE