Merge "Fix is_service_enabled when using multiple arguments"

2015-09-22 13:03:54 +00:00 · 2015-09-22 13:03:54 +00:00 · debd216a73
commit debd216a73
parent fa88c89134 3db0aad63c
1 changed files with 1 additions and 2 deletions
--- a/3
+++ b/3
@ -1842,8 +1842,7 @@ function is_service_enabled {
        # 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()