X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_filelist.py;h=81ce4c1953283dbfcd6812eb29a50a595c9b4e6f;hb=a52c847ce964432d13bb30455af3b9bad0e55002;hp=2d2e9499e932581acb2db1c95e76d741b10c4343;hpb=e8ef4a21ceff20319cde5002cb562ae05d7622c9;p=dak.git

diff --git a/dak/generate_filelist.py b/dak/generate_filelist.py
index 2d2e9499..81ce4c19 100755
--- a/dak/generate_filelist.py
+++ b/dak/generate_filelist.py
@@ -159,7 +159,7 @@ def main():
     Options = cnf.SubTree("Filelist::Options")
     if Options['Help']:
         usage()
-    pool = Pool()
+    #pool = Pool()
     query_suites = query_suites. \
         filter(Suite.suite_name.in_(utils.split_args(Options['Suite'])))
     query_components = query_components. \
@@ -179,27 +179,34 @@ def main():
                 if architecture not in suite.architectures:
                     pass
                 elif architecture.arch_string == 'source':
-                    pool.apply_async(writeSourceList,
-                        (suite_id, component_id, Options['Incremental']), callback=log)
+                    log([writeSourceList(suite_id, component_id, Options['Incremental'])])
+                    #pool.apply_async(writeSourceList,
+                    #    (suite_id, component_id, Options['Incremental']), callback=log)
                 elif architecture.arch_string == 'all':
-                    pool.apply_async(writeAllList,
-                        (suite_id, component_id, architecture_id, 'deb',
-                            Options['Incremental']), callback=log)
-                    pool.apply_async(writeAllList,
-                        (suite_id, component_id, architecture_id, 'udeb',
-                            Options['Incremental']), callback=log)
+                    log([writeAllList, suite_id, component_id, 'deb', Options['Incremental']])
+                    #pool.apply_async(writeAllList,
+                    #    (suite_id, component_id, architecture_id, 'deb',
+                    #        Options['Incremental']), callback=log)
+                    log([writeAllList, suite_id, component_id, 'udeb', Options['Incremental']])
+                    #pool.apply_async(writeAllList,
+                    #    (suite_id, component_id, architecture_id, 'udeb',
+                    #        Options['Incremental']), callback=log)
                 else: # arch any
-                    pool.apply_async(writeBinaryList,
-                        (suite_id, component_id, architecture_id, 'deb',
-                            Options['Incremental']), callback=log)
-                    pool.apply_async(writeBinaryList,
-                        (suite_id, component_id, architecture_id, 'udeb',
-                            Options['Incremental']), callback=log)
-    pool.close()
-    pool.join()
+                    log([writeBinaryList, suite_id, component_id, architecture_id, 'deb', Options['Incremental']])
+                    #pool.apply_async(writeBinaryList,
+                    #    (suite_id, component_id, architecture_id, 'deb',
+                    #        Options['Incremental']), callback=log)
+                    log([writeBinaryList, suite_id, component_id, architecture_id, 'udeb', Options['Incremental']])
+                    #pool.apply_async(writeBinaryList,
+                    #    (suite_id, component_id, architecture_id, 'udeb',
+                    #        Options['Incremental']), callback=log)
+    #pool.close()
+    #pool.join()
     # this script doesn't change the database
     session.close()
 
+    Logger.close()
+
 if __name__ == '__main__':
     main()