mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-04-15 10:31:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_sysext: Fix a crash when there were no forbidden packages

Browse Source 
Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
This commit is contained in:
Krzesimir Nowak 2025-11-13 12:50:57 +01:00
parent f1ab0601e6
commit e0cc978690
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
build_sysext
View File

@ -263,27 +263,29 @@ info "Writing ${SYSEXTNAME}_packages.txt"
ROOT="${THE_INSTALL_ROOT}" PORTAGE_CONFIGROOT="/build/${FLAGS_board}" \
equery --no-color list --format '$cpv::$repo' '*' > "${BUILD_DIR}/${SYSEXTNAME}_packages.txt"
# Check if there are forbidden packages
mapfile -t pairs <<<"${FLAGS_forbidden_packages//,/$'\n'}"
declare -A re_msg_pairs=()
for pair in "${pairs[@]}"; do
re=${pair%%;*}
msg=${pair#.;}
re_msg_pairs["${re}"]="${msg}"
done
mapfile -t pkgs <"${BUILD_DIR}/${SYSEXTNAME}_packages.txt"
has_forbidden_pkg=
for pkg in "${pkgs[@]}"; do
for re in "${!re_msg_pairs[@]}"; do
if [[ ${pkg} =~ ${re} ]]; then
has_forbidden_pkg=x
error "Forbidden package ${pkg}: ${msg}"
fi
if [[ -n ${FLAGS_forbidden_packages} ]]; then
# Check if there are forbidden packages
mapfile -t pairs <<<"${FLAGS_forbidden_packages//,/$'\n'}"
declare -A re_msg_pairs=()
for pair in "${pairs[@]}"; do
re=${pair%%;*}
msg=${pair#.;}
re_msg_pairs["${re}"]="${msg}"
done
done
if [[ -n ${has_forbidden_pkg} ]]; then
die "Forbidden packages encountered"
mapfile -t pkgs <"${BUILD_DIR}/${SYSEXTNAME}_packages.txt"
has_forbidden_pkg=
for pkg in "${pkgs[@]}"; do
for re in "${!re_msg_pairs[@]}"; do
if [[ ${pkg} =~ ${re} ]]; then
has_forbidden_pkg=x
error "Forbidden package ${pkg}: ${msg}"
fi
done
done
if [[ -n ${has_forbidden_pkg} ]]; then
die "Forbidden packages encountered"
fi
fi
if [[ "${FLAGS_strip_binaries}" = "${FLAGS_TRUE}" ]]; then