Fix debian tests

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

src/packagedcode/debian.py

@@ -7,6 +7,8 @@
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
+import os
+import logging
 from pathlib import Path
 
 from commoncode import fileutils
@@ -22,6 +24,26 @@
 Handle Debian package archives, control files and installed databases.
 """
 
+SCANCODE_DEBUG_PACKAGE_API = os.environ.get('SCANCODE_DEBUG_PACKAGE_API', False)
+
+TRACE = SCANCODE_DEBUG_PACKAGE_API
+
+def logger_debug(*args):
+    pass
+
+logger = logging.getLogger(__name__)
+
+if TRACE:
+    import sys
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
+
+    def logger_debug(*args):
+        return logger.debug(
+            ' '.join(isinstance(a, str) and a or repr(a) for a in args)
+        )
+
+
 # TODO: add dependencies
 
 
@@ -213,6 +235,9 @@ def assemble(cls, package_data, resource, codebase):
             package_data=package_data,
             datafile_path=resource.path,
         )
+
+        package_file_references = []
+        package_file_references.extend(package_data.file_references)
         package_uid = package.package_uid
 
         dependent_packages = package_data.dependencies
@@ -230,7 +255,13 @@ def assemble(cls, package_data, resource, codebase):
         # We only need to adjust the md5sum/list path in the case of `same`
         qualifiers = package_data.qualifiers or {}
         architecture = qualifiers.get('architecture')
-        multi_arch = package_data.extra_data.get('multi-arch')
+
+        multi_arch = package_data.extra_data.get('multi_arch')
+
+        if TRACE:
+            logger_debug(f' debian: assemble: multi_arch: {multi_arch}')
+            logger_debug(f' debian: assemble: architecture: {architecture}')
+
         if multi_arch == 'same':
             arch_path = f':{architecture}'
         else:
@@ -254,21 +285,23 @@ def assemble(cls, package_data, resource, codebase):
                 continue
 
             for pkgdt in res.package_data:
+                package_data = models.PackageData.from_dict(pkgdt)
                 package.update(
-                    package_data=pkgdt,
+                    package_data=package_data,
                     datafile_path=res.path,
-            )
+                )
+                package_file_references.extend(package_data.file_references)
 
             res.for_packages.append(package_uid)
             res.save(codebase)
 
             # yield possible dependencies
-            dependent_packages = pkgdt.dependencies
+            dependent_packages = package_data.dependencies
             if dependent_packages:
                 yield from models.Dependency.from_dependent_packages(
                     dependent_packages=dependent_packages,
                     datafile_path=res.path,
-                    datasource_id=pkgdt.datasource_id,
+                    datasource_id=package_data.datasource_id,
                     package_uid=package_uid,
                 )
 
@@ -280,7 +313,7 @@ def assemble(cls, package_data, resource, codebase):
         # FIXME: should we consider ONLY the md5sums?
         # merge references for the same path (e.g. .list amd .md5sum)
         file_references_by_path = {}
-        for ref in package.file_references:
+        for ref in package_file_references:
             # a file ref extends from the root of the filesystem
             ref_path = str(root_path / ref.path)
             existing = file_references_by_path.get(ref_path)
@@ -289,8 +322,6 @@ def assemble(cls, package_data, resource, codebase):
             else:
                 file_references_by_path[ref_path] = ref
 
-        package.file_references = sorted(file_references_by_path.values(), key=lambda r: r.path)
-
         for res in root_resource.walk(codebase):
             ref = file_references_by_path.get(res.path)
             if not ref:
@@ -514,6 +545,9 @@ 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
 
     yield models.PackageData(
         datasource_id=datasource_id,