Tidy up logging

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/dak/generate_filelist.py b/dak/generate_filelist.py
index 985a23fb1c8e932bea7b47eec89bb7a7ccc95628..2a566e06ed405e9e37a36a999e4d129fe3d980ee 100755 (executable)
--- a/dak/generate_filelist.py
+++ b/dak/generate_filelist.py
@@ -179,24 +179,24 @@ def main():
                 if architecture not in suite.architectures:
                     pass
                 elif architecture.arch_string == 'source':
-                    log([writeSourceList(suite_id, component_id, Options['Incremental'])])
+                    Logger.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':
-                    log([writeAllList(suite_id, component_id, architecture_id, 'deb', Options['Incremental'])])
+                    Logger.log([writeAllList(suite_id, component_id, architecture_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, architecture_id, 'udeb', Options['Incremental'])])
+                    Logger.log([writeAllList(suite_id, component_id, architecture_id, 'udeb', Options['Incremental'])])
                     #pool.apply_async(writeAllList,
                     #    (suite_id, component_id, architecture_id, 'udeb',
                     #        Options['Incremental']), callback=log)
                 else: # arch any
-                    log([writeBinaryList(suite_id, component_id, architecture_id, 'deb', Options['Incremental'])])
+                    Logger.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'])])
+                    Logger.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)

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 011bb3c0434921591b21e0bab8f8b6313f7c1d67..4d883e0f704277044294fd71f4b95f9e671e115f 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -271,12 +271,12 @@ def main():
         if s.untouchable and not force:
             utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name)
         for c in component_ids:
-            log([generate_sources(s.suite_id, c)])
+            logger.log(generate_sources(s.suite_id, c))
             #pool.apply_async(generate_sources, [s.suite_id, c], callback=log)
             for a in s.architectures:
-                log([generate_sources(s.suite_id, c, a.arch_id, 'deb')])
+                logger.log(generate_sources(s.suite_id, c, a.arch_id, 'deb'))
                 #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log)
-                log([generate_sources(s.suite_id, c, a.arch_id, 'udeb')])
+                logger.log(generate_sources(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()