Merge pull request #2973 from nexB/2971-distroless-system-packages

Convert package data dict to PackageData #2971

Author: pombredanne

src/packagedcode/debian.py

@@ -405,7 +405,7 @@ def assemble(cls, package_data, resource, codebase):
                 package.update(
                     package_data=pkgdt,
                     datafile_path=res.path,
-            )
+                )
 
             res.for_packages.append(package_uid)
             res.save(codebase)
@@ -545,7 +545,7 @@ def parse_debian_files_list(location, datasource_id, package_type):
 
             ref = models.FileReference(path=path, md5=md5sum)
             file_references.append(ref)
-    
+
     if not file_references:
         return
 

src/packagedcode/models.py

@@ -1274,6 +1274,9 @@ def update(self, package_data, datafile_path, replace=False):
         if not package_data:
             return
 
+        if isinstance(package_data, dict):
+            package_data = PackageData.from_dict(package_data)
+
         if not self.is_compatible(package_data, include_qualifiers=False):
             if TRACE_UPDATE:
                 logger_debug(f'update: {self.purl} not compatible with: {package_data.purl}')