|
|
@ -244,7 +244,7 @@ merge_yaml_str() { |
|
|
|
local entries="$@" |
|
|
|
|
|
|
|
if ! [ -r "$state_tmpdir/merge_yaml_str.py" ]; then |
|
|
|
cat <<EOF > "$state_tmpdir/merge_yaml_str.py" |
|
|
|
cat <<EOF > "$state_tmpdir/merge_yaml_str.py" || return 1 |
|
|
|
|
|
|
|
$_merge_yaml_common_code |
|
|
|
|
|
|
@ -2934,7 +2934,10 @@ if [ "$full_init" ]; then |
|
|
|
project=$(get_default_project_name) || return 1 |
|
|
|
for service in "${rebuild_relations_to_service[@]}"; do |
|
|
|
for dir in "$VARDIR/relations/$project/"*"-${service}/"*; do |
|
|
|
[ -d "$dir" ] && rm -rf "$dir" |
|
|
|
[ -d "$dir" ] && { |
|
|
|
debug rm -rf "$dir" |
|
|
|
rm -rf "$dir" |
|
|
|
} |
|
|
|
done |
|
|
|
done |
|
|
|
fi |
|
|
|