JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

aggregation: fix: don't eat value if empty during bash_string_multiline(); write end-of-file comment; show aggregation bash results if debugging

Browse Source
This commit is contained in:
Ricardo Pardini
2023-03-29 13:16:09 +02:00
committed by Igor Pečovnik
parent fe7a24885b
commit f75b9c110f
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/functions/configuration/aggregation.sh
View File

@@ -104,7 +104,12 @@ function aggregate_all_packages_python() {
# "raw_command" is only for logging purposes.
raw_command="[...shortened...] ${PYTHON3_INFO[BIN]} ${SRC}/lib/tools/aggregation.py" \
run_host_command_logged env -i "${aggregation_params_quoted[@]@Q}" "${PYTHON3_INFO[BIN]}" "${SRC}/lib/tools/aggregation.py"
#run_host_command_logged cat "${temp_file_for_aggregation}"
if [[ "${SHOW_DEBUG}" == "yes" ]]; then
display_alert "Showing aggregation results" "below" "debug"
run_tool_batcat --file-name "aggregation_results/aggregation_results.sh" "${temp_file_for_aggregation}"
fi
# shellcheck disable=SC1090
source "${temp_file_for_aggregation}" # SOURCE IT!
run_host_command_logged rm -f "${temp_file_for_aggregation}"

1
lib/tools/aggregation.py
View File

@@ -214,6 +214,7 @@ with open(output_file, "w") as bash, SummarizedMarkdownWriter("aggregation.md",
"AGGREGATED_DESKTOP_BSP_POSTINST", AGGREGATED_DESKTOP_BSP_POSTINST))
bash.write(util.prepare_bash_output_single_string(
"AGGREGATED_DESKTOP_BSP_PREPARE", AGGREGATED_DESKTOP_BSP_PREPARE))
bash.write("\n## End of aggregation output\n");
# 2) @TODO: Some removals... uninstall-inside-cache and such. (debsums case? also some gnome stuff)

7
lib/tools/common/aggregation_utils.py
View File

@@ -318,14 +318,13 @@ def prepare_bash_output_single_string(output_array_name, merged_list):
"contents"] + "\n" + "### END Source: " + refs_str + "\n\n")
values_list_bash = "\n".join(values_list)
if (len(values_list_bash) == 0):
values_list_bash = "### NO sources found during aggregation.\n"
return bash_string_multiline(output_array_name, values_list_bash)
def bash_string_multiline(var_name, contents):
return f"declare -g {var_name}" + "\n" + (
f"{var_name}=\"$(cat <<-'EOD_{var_name}_EOD'\n" +
f"{contents}\nEOD_{var_name}_EOD\n)\"\n" + "\n"
) + f"declare -r -g {var_name}" + "\n"
return f"declare -g {var_name}\n{var_name}=\"$(cat <<-'EOD_{var_name}_EOD'\n{contents}\nEOD_{var_name}_EOD\n)\"\n\n"
def encode_source_base_path_extra(contents_dict):