Merge commit 'godog/master' into merge

[dak.git] / dak / bts_categorize.py

diff --git a/dak/bts_categorize.py b/dak/bts_categorize.py
index 9112178452adaa6eb8853a769ac01d7897052759..663690a1973d9e767c71147bba66dd9c44e50a1b 100755 (executable)
--- a/dak/bts_categorize.py
+++ b/dak/bts_categorize.py
@@ -3,7 +3,9 @@
 """
 bts -- manage bugs filed against ftp.debian.org
 
-Copyright 2009 Mike O'Connor <stew@vireo.org>
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2009 Mike O'Connor <stew@vireo.org>
+@license: GNU General Public License version 2 or later
 """
 
 #  This program is free software; you can redistribute it and/or modify it
@@ -120,10 +122,14 @@ class BugClassifier(object):
         controls = ""
 
         bc = BugClassifier()
-        for bug in bc.unclassified_bugs():
-            controls += bc.classify_bug(bug)
-
-        return controls
+        try:
+            for bug in bc.unclassified_bugs():
+                controls += bc.classify_bug(bug)
+
+            return controls
+        except:
+            log.error("couldn't retrieve bugs from soap interface: %s" % sys.exc_info()[0])
+            return None
 
 def send_email(commands, simulate=False):
     global Cnf