X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fbts_categorize.py;h=4a803d569adafa3f851ec0778289cc8fb320c66f;hb=6d03dbb954cd67e522374c12225aa08a129e5d60;hp=9112178452adaa6eb8853a769ac01d7897052759;hpb=2590489f707aae36c7d78058608abb25427a0b59;p=dak.git

diff --git a/dak/bts_categorize.py b/dak/bts_categorize.py
index 91121784..4a803d56 100755
--- a/dak/bts_categorize.py
+++ b/dak/bts_categorize.py
@@ -3,7 +3,10 @@
 """
 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>
+@copyright: 2010 Alexander Reichle-Schmehl <tolimar@debian.org>
+@license: GNU General Public License version 2 or later
 """
 
 #  This program is free software; you can redistribute it and/or modify it
@@ -31,7 +34,7 @@ log = logging.getLogger()
 
 import apt_pkg
 from daklib import utils
-from btsutils.debbugs import debbugs
+import debianbts as bts
 
 def usage():
     print """
@@ -81,18 +84,19 @@ class BugClassifier(object):
                     dak_re: 'dak',
                     arch_re: 'archs'}
 
-    def __init__( self ):
-        self.bts = debbugs()
-        self.bts.setUsers(['ftp.debian.org@packages.debian.org'])
-
-
     def unclassified_bugs(self):
         """
         Returns a list of open bugs which have not yet been classified
         by one of our usertags.
         """
-        return [ bug for bug in self.bts.query("pkg:ftp.debian.org") \
-                     if bug.status=='pending' and not bug.usertags ]
+
+	tagged_bugs = bts.get_usertag('ftp.debian.org@packages.debian.org')
+	tagged_bugs_ftp = []
+	for tags in tagged_bugs.keys():
+		tagged_bugs_ftp += tagged_bugs[tags]
+
+        return [ bug for bug in bts.get_status( bts.get_bugs("package", "ftp.debian.org" ) ) \
+                     if bug.pending=='pending' and not bug.bug_num in tagged_bugs_ftp ]
 
 
     def classify_bug(self, bug):
@@ -104,15 +108,15 @@ class BugClassifier(object):
         retval = ""
 
         for classifier in self.classifiers.keys():
-            if classifier.match(bug.summary):
-                retval = "usertag %s %s\n" % (bug.bug,
+            if classifier.match(bug.subject):
+                retval = "usertag %s %s\n" % (bug.bug_num,
                                             self.classifiers[classifier])
                 break
 
         if retval:
             log.info(retval)
         else:
-            log.debug("Unmatched: [%s] %s" % (bug.bug, bug.summary))
+            log.debug("Unmatched: [%s] %s" % (bug.bug_num, bug.summary))
 
         return retval
 
@@ -120,10 +124,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