Handle exceptions in dak contents scan-source.

Signed-off-by: Torsten Werner <twerner@debian.org>

diff --git a/dak/contents.py b/dak/contents.py
index 9c85a50abe94b68c0750d7f548f6f14898fa050d..ee904b2a2467e4f0d100e03e5dca3396e3587b14 100755 (executable)
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -89,7 +89,7 @@ def write_all(cnf, suite_names = [], force = None):
 ################################################################################
 
 def binary_scan_all(cnf, limit):
-    Logger = daklog.Logger(cnf.Cnf, 'contents binary_scan')
+    Logger = daklog.Logger(cnf.Cnf, 'contents scan-binary')
     result = BinaryContentsScanner.scan_all(limit)
     processed = '%(processed)d packages processed' % result
     remaining = '%(remaining)d packages remaining' % result
@@ -99,7 +99,7 @@ def binary_scan_all(cnf, limit):
 ################################################################################
 
 def source_scan_all(cnf, limit):
-    Logger = daklog.Logger(cnf.Cnf, 'contents source_scan')
+    Logger = daklog.Logger(cnf.Cnf, 'contents scan-source')
     result = SourceContentsScanner.scan_all(limit)
     processed = '%(processed)d packages processed' % result
     remaining = '%(remaining)d packages remaining' % result

diff --git a/daklib/contents.py b/daklib/contents.py
index 8c064226273be24d7e61c9b6831ade590bd6aadb..69000acf816c845305e333efb7ae711a97e331af 100755 (executable)
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -430,6 +430,9 @@ def source_scan_helper(source_id):
     '''
     This function runs in a subprocess.
     '''
-    scanner = SourceContentsScanner(source_id)
-    scanner.scan()
+    try:
+        scanner = SourceContentsScanner(source_id)
+        scanner.scan()
+    except Exception, e:
+        print e