From 0328f2a585be350eee229dc05c0ed8163b61b47c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 24 Jul 2024 18:39:17 -0500 Subject: spdx30_tasks.py: switch from exists to isfile checking debugsrc Same change as previously made to the create-spdx-2.2.bbclass, while debugsrc is almost always a file (or link), there are apparently cases where a directory could be returned from the dwarfsrcfiles processing. When this happens, the hashing fails and an error results when building the SPDX documents. (From OE-Core rev: 5262f9bbf86c4e529ff988d465ddad2d1db0b073) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/lib/oe/spdx30_tasks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/lib/oe/spdx30_tasks.py b/meta/lib/oe/spdx30_tasks.py index 7baa6be70e..9d5bbadc0f 100644 --- a/meta/lib/oe/spdx30_tasks.py +++ b/meta/lib/oe/spdx30_tasks.py @@ -238,7 +238,8 @@ def get_package_sources_from_debug( if file_sha256 is None: continue else: - if not debugsrc_path.exists(): + # We can only hash files below, skip directories, links, etc. + if not debugsrc_path.isfile(): source_hash_cache[debugsrc_path] = None continue -- cgit v1.2.3-54-g00ecf