| Message ID | 20260805055739.2325838-1-mike.looijmans@topic.nl |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | spdx_common.py: Avoid crash when this_dep.taskhash_deps is None | expand |
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/spdx_common.py-Avoid-crash-when-this_dep.taskhash_deps-is-None.patch FAIL: test Signed-off-by presence: Mbox is missing Signed-off-by. Add it manually or with "git commit --amend -s" (test_mbox.TestMbox.test_signed_off_by_presence) PASS: pretest pylint (test_python_pylint.PyLint.pretest_pylint) PASS: test auh changelog truncation notice (test_mbox.TestMbox.test_auh_changelog_truncation_notice) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test pylint (test_python_pylint.PyLint.test_pylint) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list) SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files) SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore) SKIP: test CVE tag format: No new source patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new source patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new source patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test src uri left files: No modified recipes, skipping test (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
diff --git a/meta/lib/oe/spdx_common.py b/meta/lib/oe/spdx_common.py index 6b1a409c40..d09f749d0e 100644 --- a/meta/lib/oe/spdx_common.py +++ b/meta/lib/oe/spdx_common.py @@ -124,7 +124,7 @@ def collect_direct_deps(d, dep_task): dep_data = taskdepdata[dep_name] if dep_data.taskname == dep_task and dep_data.pn != pn: deps.add( - Dep(dep_data.pn, dep_data.hashfn, dep_name in this_dep.taskhash_deps) + Dep(dep_data.pn, dep_data.hashfn, this_dep.taskhash_deps and (p_name in this_dep.taskhash_deps)) ) return sorted(deps)
Apparently this_dep.taskhash_deps can be None in some cases, which results in the stacktrace below. Add a check to avoid this. Solves: DEBUG: Executing python function sstate_task_prefunc DEBUG: Python function sstate_task_prefunc finished DEBUG: Executing python function do_create_recipe_spdx ERROR: Error executing a python function in exec_func_python() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_func_python() autogenerated', lineno: 2, function: <module> 0001: *** 0002:do_create_recipe_spdx(d) 0003: File: '/.../oe-core/meta/classes/create-spdx-3.0.bbclass', lineno: 193, function: do_create_recipe_spdx 0189: " 0190: 0191:python do_create_recipe_spdx() { 0192: import oe.spdx30_tasks *** 0193: oe.spdx30_tasks.create_recipe_spdx(d) 0194:} 0195:addtask do_create_recipe_spdx 0196: 0197:SSTATETASKS += "do_create_recipe_spdx" File: '/.../oe-core/meta/lib/oe/spdx30_tasks.py', lineno: 675, function: create_recipe_spdx 0671: identifier=cpe_id, 0672: ) 0673: ) 0674: *** 0675: direct_deps = oe.spdx_common.collect_direct_deps(d, "do_create_recipe_spdx") 0676: 0677: dep_objsets, dep_recipes = collect_dep_objsets( 0678: d, direct_deps, "static", "static-", oe.spdx30.software_Package 0679: ) File: '/.../oe-core/meta/lib/oe/spdx_common.py', lineno: 127, function: collect_direct_deps 0123: for dep_name in this_dep.deps: 0124: dep_data = taskdepdata[dep_name] 0125: if dep_data.taskname == dep_task and dep_data.pn != pn: 0126: deps.add( *** 0127: Dep(dep_data.pn, dep_data.hashfn, dep_name in this_dep.taskhash_deps) 0128: ) 0129: 0130: return sorted(deps) 0131: Exception: TypeError: argument of type 'NoneType' is not iterable DEBUG: Python function do_create_recipe_spdx finished --- meta/lib/oe/spdx_common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)