Make external overrides specific for (suite, component)

[dak.git] / dak / generate_packages_sources2.py

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index c23ede9bcd3a2a246e3a1a71d76b3a935a825642..769b79da0de74de51b5ca7dad6344f082530f05a 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -89,7 +89,7 @@ JOIN priority pri ON o.priority = pri.id
 
 WHERE
   sa.suite = :suite
-  AND o.suite = :suite AND o.component = :component AND o.type = :dsc_type
+  AND o.suite = :overridesuite AND o.component = :component AND o.type = :dsc_type
 
 ORDER BY
 s.source, s.version
@@ -104,11 +104,13 @@ def generate_sources(suite_id, component_id):
     suite = session.query(Suite).get(suite_id)
     component = session.query(Component).get(component_id)
 
+    overridesuite_id = suite.get_overridesuite().suite_id
+
     writer = SourcesFileWriter(suite=suite.suite_name, component=component.component_name)
     output = writer.open()
 
     # run query and write Sources
-    r = session.execute(_sources_query, {"suite": suite_id, "component": component_id, "dsc_type": dsc_type})
+    r = session.execute(_sources_query, {"suite": suite_id, "component": component_id, "dsc_type": dsc_type, "overridesuite": overridesuite_id})
     for (stanza,) in r:
         print >>output, stanza
         print >>output, ""
@@ -163,7 +165,9 @@ SELECT
   || COALESCE(E'\n' || (SELECT
      STRING_AGG(key || '\: ' || value, E'\n' ORDER BY key)
    FROM external_overrides eo
-   WHERE eo.package = tmp.package
+   WHERE
+     eo.package = tmp.package
+     AND eo.suite = :overridesuite AND eo.component = :component
   ), '')
   || E'\nSection\: ' || sec.section
   || E'\nPriority\: ' || pri.priority
@@ -188,7 +192,7 @@ WHERE
       (architecture = :arch_all AND source NOT IN (SELECT DISTINCT source FROM tmp WHERE architecture <> :arch_all))
   )
   AND
-    o.type = :type_id AND o.suite = :suite AND o.component = :component
+    o.type = :type_id AND o.suite = :overridesuite AND o.component = :component
 
 ORDER BY tmp.package, tmp.version
 """
@@ -204,12 +208,15 @@ def generate_packages(suite_id, component_id, architecture_id, type_name):
     component = session.query(Component).get(component_id)
     architecture = session.query(Architecture).get(architecture_id)
 
+    overridesuite_id = suite.get_overridesuite().suite_id
+
     writer = PackagesFileWriter(suite=suite.suite_name, component=component.component_name,
             architecture=architecture.arch_string, debtype=type_name)
     output = writer.open()
 
     r = session.execute(_packages_query, {"suite": suite_id, "component": component_id,
-        "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id})
+        "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id,
+        "overridesuite": overridesuite_id})
     for (stanza,) in r:
         print >>output, stanza
         print >>output, ""