mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-01-15 21:41:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

pkg-auto: Explicit location for non-ebuild diffs in package handling

Browse Source 
This is a step towards using different output directory in package
handling. This will be needed for the eventual package handling jobs
system, where each job has its own output directory.
This commit is contained in:
Krzesimir Nowak 2025-08-19 19:23:47 +02:00
parent d0c9018fed
commit 1ab38abdae
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg_auto/impl/pkg_auto_lib.sh
View File

@ -2202,7 +2202,7 @@ function handle_package_changes() {
hpc_package_output_paths[POP_PKG_OUT_DIR_IDX]=${hpc_update_dir_non_slot}
# POP_PKG_SLOT_OUT_DIR_IDX will be set in loops below
generate_non_ebuild_diffs "${OLD_PORTAGE_STABLE}" "${NEW_PORTAGE_STABLE}" "${old_name}" "${new_name}"
generate_non_ebuild_diffs "${hpc_update_dir_non_slot}" "${OLD_PORTAGE_STABLE}" "${NEW_PORTAGE_STABLE}" "${old_name}" "${new_name}"
generate_full_diffs "${hpc_update_dir_non_slot}" "${OLD_PORTAGE_STABLE}" "${NEW_PORTAGE_STABLE}" "${old_name}" "${new_name}"
generate_package_mention_reports "${NEW_STATE}" "${old_name}" "${new_name}"
@ -2741,12 +2741,14 @@ function generate_full_diffs() {
#
# Params:
#
# 1 - path to portage-stable in old state
# 2 - path to portage-stable in new state
# 3 - old package name
# 4 - new package name
# 1 - output directory
# 2 - path to portage-stable in old state
# 3 - path to portage-stable in new state
# 4 - old package name
# 5 - new package name
function generate_non_ebuild_diffs() {
local old_ps new_ps old_pkg new_pkg
local out_dir old_ps new_ps old_pkg new_pkg
out_dir=${1}; shift
old_ps=${1}; shift
new_ps=${1}; shift
old_pkg=${1}; shift
@ -2756,9 +2758,6 @@ function generate_non_ebuild_diffs() {
old_path="${old_ps}/${old_pkg}"
new_path="${new_ps}/${new_pkg}"
local gned_update_dir
update_dir_non_slot "${new_pkg}" gned_update_dir
local -a diff_opts=(
--recursive
--unified=3
@ -2768,7 +2767,7 @@ function generate_non_ebuild_diffs() {
--exclude='*.ebuild'
--exclude='Manifest'
)
xdiff "${diff_opts[@]}" "${old_path}" "${new_path}" >"${gned_update_dir}/other.diff"
xdiff "${diff_opts[@]}" "${old_path}" "${new_path}" >"${out_dir}/other.diff"
}
# Generate a diff between specific ebuilds for old and new package.