commit debd216a7338e4023f5ea38506dae7882379f6d6
author Jenkins <jenkins@review.openstack.org> Tue Sep 22 13:03:54 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue Sep 22 13:03:54 2015 +0000
tree 06e24964962553d5f1d358d74f189cc6b1fb1dac
parent fa88c8913458a9e9c7bb6560dc82cb0a9d1b0e90
parent 3db0aad63c182a88830ec61fc048240058c02d85

Merge "Fix is_service_enabled when using multiple arguments"

functions-common

diff --git a/functions-common b/functions-common
index 4e85001..cf14007 100644
--- a/functions-common
+++ b/functions-common
@@ -1842,8 +1842,7 @@
         # Look for top-level 'enabled' function for this service
         if type is_${service}_enabled >/dev/null 2>&1; then
             # A function exists for this service, use it
-            is_${service}_enabled
-            enabled=$?
+            is_${service}_enabled && enabled=0
         fi
 
         # TODO(dtroyer): Remove these legacy special-cases after the is_XXX_enabled()