|
@ -1033,6 +1033,7 @@ _rec_get_depth() { |
|
|
} |
|
|
} |
|
|
export -f _rec_get_depth |
|
|
export -f _rec_get_depth |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
get_ordered_service_dependencies() { |
|
|
get_ordered_service_dependencies() { |
|
|
local services=("$@") cache_file="$state_tmpdir/$FUNCNAME.cache.$(echo "$*" | md5_compat)" |
|
|
local services=("$@") cache_file="$state_tmpdir/$FUNCNAME.cache.$(echo "$*" | md5_compat)" |
|
|
if [ -e "$cache_file" ]; then |
|
|
if [ -e "$cache_file" ]; then |
|
@ -1502,7 +1503,7 @@ _run_service_action_direct() { |
|
|
local service="$1" action="$2" charm _dummy |
|
|
local service="$1" action="$2" charm _dummy |
|
|
shift; shift |
|
|
shift; shift |
|
|
|
|
|
|
|
|
read-0 charm || true ## against 'set -e' that could be setup in parent scripts |
|
|
|
|
|
|
|
|
read-0 charm || true ## against 'set -e' that could be setup in parent scripts |
|
|
|
|
|
|
|
|
if read-0 _dummy || [ "$_dummy" ]; then |
|
|
if read-0 _dummy || [ "$_dummy" ]; then |
|
|
print_syntax_error "$FUNCNAME: too many arguments in action descriptor" |
|
|
print_syntax_error "$FUNCNAME: too many arguments in action descriptor" |
|
@ -1664,7 +1665,6 @@ export -f has_service_action |
|
|
run_service_action () { |
|
|
run_service_action () { |
|
|
local service="$1" action="$2" |
|
|
local service="$1" action="$2" |
|
|
shift ; shift |
|
|
shift ; shift |
|
|
|
|
|
|
|
|
{ |
|
|
{ |
|
|
if ! read-0 action_type; then |
|
|
if ! read-0 action_type; then |
|
|
info "Service $DARKYELLOW$service$NORMAL does not have any action $DARKCYAN$action$NORMAL defined." |
|
|
info "Service $DARKYELLOW$service$NORMAL does not have any action $DARKCYAN$action$NORMAL defined." |
|
|