auto-decruft: Disable short options for NVI

[dak.git] / dak / make_pkg_file_mapping.py

diff --git a/dak/make_pkg_file_mapping.py b/dak/make_pkg_file_mapping.py
index 175376709a14405dcafb737eb8f375fd389141ed..f52836f8b2c32881cc0f894a79411115d717ee01 100755 (executable)
--- a/dak/make_pkg_file_mapping.py
+++ b/dak/make_pkg_file_mapping.py
@@ -52,8 +52,9 @@ def build_mapping(archive, session):
       JOIN files ON files.id=dsc_files.file
       JOIN files_archive_map ON files.id = files_archive_map.file_id
       JOIN component ON files_archive_map.component_id = component.id
+      JOIN files_archive_map fam_dsc ON fam_dsc.file_id=source.file AND fam_dsc.component_id=component.id AND fam_dsc.archive_id=files_archive_map.archive_id
     WHERE files_archive_map.archive_id = :archive_id
-    ORDER BY source, version
+    ORDER BY source, version, component.id, files.filename
     """
 
     query_binaries = """