Fix error if there aren't summary & description (using --rpm-package-…

…hash)
AlmaLinux · Jun 27, 2024 · 8aab44e · 8aab44e
1 parent 0e4f9be
commit 8aab44e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/libsbom/cyclonedx.py b/libsbom/cyclonedx.py
@@ -133,8 +133,9 @@ def __generate_package_component(self, comp):
                 self.__generate_prop(prop) for prop in comp['properties']
             ],
             licenses=self.__generate_licenses(comp['licenses'])
-                if 'licenses' in comp and comp['licenses'] else [] ,
+                if 'licenses' in comp and comp['licenses'] else None ,
             description=comp['description']
+                if 'description' in comp and comp['description'] else None ,
         )
 
     def generate_build_sbom(self):

diff --git a/libsbom/spdx.py b/libsbom/spdx.py
@@ -254,8 +254,10 @@ def add_package(self, component, build):
         #                 pass
         #         pkg.license_info_from_files = l
 
-        pkg.summary = component['summary']
-        pkg.description = component['description']
+        if 'summary' in component and component['summary']:
+            pkg.summary = component['summary']
+        if 'description' in component and component['description']:
+            pkg.description = component['description']
 
         self._document.packages += [pkg]
         self._document.relationships += [rel]