X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_pkg_file_mapping.py;h=f52836f8b2c32881cc0f894a79411115d717ee01;hb=6f863f95e3d1bae18aa5579e958fd8a121b06545;hp=175376709a14405dcafb737eb8f375fd389141ed;hpb=ed9782ad5afa4dce73ce88d412e38182329a21ad;p=dak.git

diff --git a/dak/make_pkg_file_mapping.py b/dak/make_pkg_file_mapping.py
index 17537670..f52836f8 100755
--- 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 = """