From: Ross Burton Date: Wed, 1 Apr 2026 16:54:46 +0000 (+0100) Subject: classes/sbom-cve-check: use named variables when iterating X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abe1192c2d64d361d99ae44560666f0736ac85ce;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git classes/sbom-cve-check: use named variables when iterating Little cleanups: unpack when iterating to avoid needing to use indexes, and only update symlinks if update_link is not None. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/classes-recipe/sbom-cve-check.bbclass b/meta/classes-recipe/sbom-cve-check.bbclass index 2a8429d0b1..f9f6461100 100644 --- a/meta/classes-recipe/sbom-cve-check.bbclass +++ b/meta/classes-recipe/sbom-cve-check.bbclass @@ -71,9 +71,9 @@ python do_sbom_cve_check() { "--disable-auto-updates" ] - for export_file in export_files: + for export_type, export_file, export_link in export_files: cmd_args.extend( - ["--export-type", export_file[0], "--export-path", export_file[1]] + ["--export-type", export_type, "--export-path", export_file] ) cmd_args.extend(d.getVar("SBOM_CVE_CHECK_EXTRA_ARGS").split()) @@ -85,9 +85,10 @@ python do_sbom_cve_check() { bb.error(f"sbom-cve-check failed: {e}") return - for export_file in export_files: - bb.note(f"sbom-cve-check exported: {export_file[1]}") - update_symlinks(export_file[1], export_file[2]) + for export_type, export_file, export_link in export_files: + bb.note(f"sbom-cve-check exported: {export_file}") + if export_link: + update_symlinks(export_file, export_link) } addtask do_sbom_cve_check after do_create_image_sbom_spdx before do_build