[dak/master 6/8] Handle exceptions in dak contents scan-source.
Signed-off-by: Torsten Werner <twerner@debian.org>
---
dak/contents.py | 4 ++--
daklib/contents.py | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dak/contents.py b/dak/contents.py
index 9c85a50..ee904b2 100755
--- 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 8c06422..69000ac 100755
--- 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
--
1.7.2.5
Reply to: