Merge remote branch 'ansgar/p-s-from-db' into merge

[dak.git] / dak / generate_packages_sources2.py

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 769b79da0de74de51b5ca7dad6344f082530f05a..4523252cc0e8ac0f1145fef530bfb155f3536d47 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -194,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):
@@ -268,20 +268,27 @@ def main():
     def log(details):
         logger.log(details)
 
-    pool = Pool()
+    #pool = Pool()
     for s in suites:
         if s.untouchable and not force:
             utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name)
         for c in component_ids:
-            pool.apply_async(generate_sources, [s.suite_id, c], callback=log)
+            logger.log(generate_sources(s.suite_id, c))
+            #pool.apply_async(generate_sources, [s.suite_id, c], callback=log)
             for a in s.architectures:
-                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log)
-                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log)
-
-    pool.close()
-    pool.join()
+                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'))
+                #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log)
+
+    #pool.close()
+    #pool.join()
     # this script doesn't change the database
     session.close()
 
+    logger.close()
+
 if __name__ == '__main__':
     main()