include only packages in the right component in Sources

Having overrides for the same package in multiple components should not
cause source packages to be listed in the wrong Sources index.

Reference: https://lists.debian.org/debian-mirrors/2012/09/msg00020.html

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index ff890377db47f2e8abea926cfa30b51a9d8de16a..4cf8359abc245c3c728fb87fe86b9799aaeb6671 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -78,6 +78,10 @@ FROM
 source s
 JOIN src_associations sa ON s.id = sa.source
 JOIN files f ON s.file=f.id
+JOIN files_archive_map fam
+  ON fam.file_id = f.id
+     AND fam.archive_id = (SELECT archive_id FROM suite WHERE id = :suite)
+     AND fam.component_id = :component
 JOIN override o ON o.package = s.source
 JOIN section sec ON o.section = sec.id
 JOIN priority pri ON o.priority = pri.id