X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fgenerate_packages_sources2.py;h=4523252cc0e8ac0f1145fef530bfb155f3536d47;hb=e6a26ca720356e214b73b834e02ff94d3b873862;hp=b8f7762e7fe822d786102905e618d26ebc6fe49c;hpb=e911eae72488a1f60cb4016bc50b2f1febfa262a;p=dak.git

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index b8f7762e..4523252c 100755
--- 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
@@ -192,7 +194,7 @@ WHERE
   AND
     o.type = :type_id AND o.suite = :overridesuite AND o.component = :component
 
-ORDER BY tmp.package, tmp.version
+ORDER BY tmp.source, tmp.package, tmp.version
 """
 
 def generate_packages(suite_id, component_id, architecture_id, type_name):
@@ -274,6 +276,8 @@ 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:
+                if a == 'source':
+                    continue
                 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_packages(s.suite_id, c, a.arch_id, 'udeb'))
@@ -284,5 +288,7 @@ def main():
     # this script doesn't change the database
     session.close()
 
+    logger.close()
+
 if __name__ == '__main__':
     main()