diff mbox series

[3/6] meta/lib/oe/sbom30.py: create hasDeclaredLicense relationship conditionally

Message ID 20241026032519.1968518-4-hongxu.jia@windriver.com
State New
Headers show
Series Support SPDX include source for work-share directory | expand

Commit Message

Hongxu Jia Oct. 26, 2024, 3:25 a.m. UTC 
If file_licenses is empty, the hasDeclaredLicense relationship from sourcefile
to NoneElement which makes no sense. Such as

    {
      "type": "Relationship",
      ...
      "from": "http://spdx.org/spdxdocs/gettext-minimal-native-1fa0d5cb/sourcefile/3323",
      "relationshipType": "hasDeclaredLicense",
      "to": [
        "NoneElement"
      ]
    },

Create hasDeclaredLicense relationship only if file_licenses is not empty

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/lib/oe/sbom30.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/meta/lib/oe/sbom30.py b/meta/lib/oe/sbom30.py
index f4cc1f49dd..6df5759596 100644
--- a/meta/lib/oe/sbom30.py
+++ b/meta/lib/oe/sbom30.py
@@ -620,11 +620,12 @@  class ObjectSet(oe.spdx30.SHACLObjectSet):
         for extracted_lic in oe.spdx_common.extract_licenses(filepath):
             file_licenses.add(self.new_license_expression(extracted_lic, license_data))
 
-        self.new_relationship(
-            [spdx_file],
-            oe.spdx30.RelationshipType.hasDeclaredLicense,
-            file_licenses,
-        )
+        if file_licenses:
+            self.new_relationship(
+                [spdx_file],
+                oe.spdx30.RelationshipType.hasDeclaredLicense,
+                file_licenses,
+            )
         spdx_file.extension.append(OELicenseScannedExtension())
 
     def new_file(self, _id, name, path, *, purposes=[]):