Merge remote-tracking branch 'origin/master' into p-s-from-db

[dak.git] / dak / generate_packages_sources2.py

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 4d883e0f704277044294fd71f4b95f9e671e115f..fbae045fd1676ce2afc323f34c7404b9b3dbd01c 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -165,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
@@ -274,9 +276,9 @@ def main():
             logger.log(generate_sources(s.suite_id, c))
             #pool.apply_async(generate_sources, [s.suite_id, c], callback=log)
             for a in s.architectures:
-                logger.log(generate_sources(s.suite_id, c, a.arch_id, 'deb'))
+                logger.log(generate_packages(s.suite_id, c, a.arch_id, 'deb'))
                 #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log)
-                logger.log(generate_sources(s.suite_id, c, a.arch_id, 'udeb'))
+                logger.log(generate_packages(s.suite_id, c, a.arch_id, 'udeb'))
                 #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log)
 
     #pool.close()
@@ -284,5 +286,7 @@ def main():
     # this script doesn't change the database
     session.close()
 
+    logger.close()
+
 if __name__ == '__main__':
     main()