mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-07 13:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixup! license filtering

Browse Source
This commit is contained in:
Krzesimir Nowak 2025-08-05 18:59:44 +02:00
parent 8e34df8e40
commit f07f8be515
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg_auto/impl/pkg_auto_lib.sh
View File

@ -1906,6 +1906,9 @@ function handle_package_changes_job() {
local we_are_done='' line local we_are_done='' line
local -a reply_lines pair local -a reply_lines pair
local -i i pkg_count local -i i pkg_count
local used_licenses_file="${output_dir}/used-licenses"
local -A hpcj_used_licenses_set=()
local REPLY local REPLY
while [[ -z ${we_are_done} ]]; do while [[ -z ${we_are_done} ]]; do
@ -1923,7 +1926,7 @@ function handle_package_changes_job() {
for line in "${reply_lines[@]}"; do for line in "${reply_lines[@]}"; do
mapfile -t pair <<<"${line// /$'\n'}" mapfile -t pair <<<"${line// /$'\n'}"
if [[ ${#pair[@]} -eq 2 ]]; then if [[ ${#pair[@]} -eq 2 ]]; then
handle_one_package_change "${output_dir}" "${bunch_of_maps_var_name}" "${pair[@]}" handle_one_package_change "${output_dir}" "${bunch_of_maps_var_name}" hpcj_used_licenses_set "${pair[@]}"
else else
echo "invalid message received: ${line@Q}, expected a pair of package names" echo "invalid message received: ${line@Q}, expected a pair of package names"
fi fi
@ -1932,6 +1935,11 @@ function handle_package_changes_job() {
echo "invalid message received: ${REPLY@Q}, expected a number or ${we_are_done_msg@Q}" echo "invalid message received: ${REPLY@Q}, expected a number or ${we_are_done_msg@Q}"
fi fi
done done
if [[ ${#hpcj_used_licenses_set[@]} -gt 0 ]]; then
printf '%s\n' "${!hpcj_used_licenses_set[@]}" >"${used_licenses_file}"
fi
return 0 return 0
} }
@ -1947,12 +1955,12 @@ function package_output_paths_unset() {
function handle_one_package_change() { function handle_one_package_change() {
local output_dir=${1}; shift local output_dir=${1}; shift
local -n bunch_of_maps_ref=${1}; shift local -n bunch_of_maps_ref=${1}; shift
local used_licenses_set_var_name=${1}; shift
local old_name=${1}; shift local old_name=${1}; shift
local new_name=${1}; shift local new_name=${1}; shift
local warnings_dir="${output_dir}/warnings" local warnings_dir="${output_dir}/warnings"
local updates_dir="${output_dir}/updates" local updates_dir="${output_dir}/updates"
local used_licenses_file="${output_dir}/used-licenses"
local pkg_to_tags_mvm_var_name=${bunch_of_maps_ref[BOM_PKG_TO_TAGS_MVM_IDX]} local pkg_to_tags_mvm_var_name=${bunch_of_maps_ref[BOM_PKG_TO_TAGS_MVM_IDX]}
local pkg_slots_set_mvm_var_name=${bunch_of_maps_ref[BOM_PKG_SLOTS_SET_MVM_IDX]} local pkg_slots_set_mvm_var_name=${bunch_of_maps_ref[BOM_PKG_SLOTS_SET_MVM_IDX]}
@ -2099,8 +2107,6 @@ function handle_one_package_change() {
generate_full_diffs "${update_dir_non_slot}" "${old_repo_path}" "${new_repo_path}" "${old_name}" "${new_name}" generate_full_diffs "${update_dir_non_slot}" "${old_repo_path}" "${new_repo_path}" "${old_name}" "${new_name}"
generate_package_mention_reports "${update_dir_non_slot}" "${NEW_STATE}" "${old_name}" "${new_name}" generate_package_mention_reports "${update_dir_non_slot}" "${NEW_STATE}" "${old_name}" "${new_name}"
local -A hopc_used_licenses_set=()
local hopc_changed='' local hopc_changed=''
local old_verminmax new_verminmax local old_verminmax new_verminmax
local hopc_slot_dirname local hopc_slot_dirname
@ -2139,7 +2145,7 @@ function handle_one_package_change() {
parse_cache_file hopc_new_cache_file "${new_cache_path}/${new_name}-${new_version}" "${ARCHES[@]}" parse_cache_file hopc_new_cache_file "${new_cache_path}/${new_name}-${new_version}" "${ARCHES[@]}"
diff_cache_data hopc_old_cache_file hopc_new_cache_file "${diff_lib_filters_var_name}" hopc_diff_report diff_cache_data hopc_old_cache_file hopc_new_cache_file "${diff_lib_filters_var_name}" hopc_diff_report
evaluate_licenses hopc_new_cache_file "${kvr_reports_var_name}" "${new_name}" "${s}" "${new_version}" hopc_used_licenses_set evaluate_licenses hopc_new_cache_file "${kvr_reports_var_name}" "${new_name}" "${s}" "${new_version}" "${used_licenses_set_var_name}"
gentoo_ver_cmp_out "${new_version}" "${old_version}" hopc_cmp_result gentoo_ver_cmp_out "${new_version}" "${old_version}" hopc_cmp_result
case ${hopc_cmp_result} in case ${hopc_cmp_result} in
@ -2201,7 +2207,7 @@ function handle_one_package_change() {
parse_cache_file hopc_new_cache_file "${new_cache_path}/${new_name}-${new_version}" "${ARCHES[@]}" parse_cache_file hopc_new_cache_file "${new_cache_path}/${new_name}-${new_version}" "${ARCHES[@]}"
diff_cache_data hopc_old_cache_file hopc_new_cache_file "${diff_lib_filters_var_name}" hopc_diff_report diff_cache_data hopc_old_cache_file hopc_new_cache_file "${diff_lib_filters_var_name}" hopc_diff_report
evaluate_licenses hopc_new_cache_file "${kvr_reports_var_name}" "${new_name}" "${hopc_new_s}" "${new_version}" hopc_used_licenses_set evaluate_licenses hopc_new_cache_file "${kvr_reports_var_name}" "${new_name}" "${hopc_new_s}" "${new_version}" "${used_licenses_set_var_name}"
gentoo_ver_cmp_out "${new_version}" "${old_version}" hopc_cmp_result gentoo_ver_cmp_out "${new_version}" "${old_version}" hopc_cmp_result
case ${hopc_cmp_result} in case ${hopc_cmp_result} in
@ -2260,15 +2266,11 @@ function handle_one_package_change() {
parse_cache_file hopc_new_cache_file "${new_cache_path}/${new_name}-${new_version}" "${ARCHES[@]}" parse_cache_file hopc_new_cache_file "${new_cache_path}/${new_name}-${new_version}" "${ARCHES[@]}"
evaluate_licenses hopc_new_cache_file "${kvr_reports_var_name}" "${new_name}" "${s}" "${new_version}" hopc_used_licenses_set evaluate_licenses hopc_new_cache_file "${kvr_reports_var_name}" "${new_name}" "${s}" "${new_version}" "${used_licenses_set_var_name}"
cache_file_unset hopc_new_cache_file cache_file_unset hopc_new_cache_file
done done
fi fi
if [[ ${#hopc_used_licenses_set[@]} -gt 0 ]]; then
printf '%s\n' "${!hopc_used_licenses_set[@]}" >"${used_licenses_file}"
fi
package_output_paths_unset hopc_package_output_paths package_output_paths_unset hopc_package_output_paths
unset -n new_slot_verminmax_map_ref old_slot_verminmax_map_ref unset -n new_slot_verminmax_map_ref old_slot_verminmax_map_ref
# if nothing changed, drop the entire update directory for the # if nothing changed, drop the entire update directory for the