diff mbox series

[1/2] spdx30_tasks.py: switch from exists to isfile checking debugsrc

Message ID 1721864358-26583-2-git-send-email-mark.hatle@kernel.crashing.org
State Accepted, archived
Commit 5262f9bbf86c4e529ff988d465ddad2d1db0b073
Headers show
Series SDKs w/ multilibs and spdx30 'isfile' | expand

Commit Message

Mark Hatle July 24, 2024, 11:39 p.m. UTC
From: Mark Hatle <mark.hatle@amd.com>

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.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta/lib/oe/spdx30_tasks.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

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