rev 3591 - in debbugs-illa: . bts

[Pierre Habouzit]

Author: madcoder
Date: 2006-04-18 17:10:31 +0000 (Tue, 18 Apr 2006)
New Revision: 3591

Modified:
   debbugs-illa/bts/__init__.py
   debbugs-illa/bts/report.py
   debbugs-illa/bzlink.py
   debbugs-illa/bzsync.py
   debbugs-illa/config.py
Log:
bye bye `so called' patterns.



Modified: debbugs-illa/bts/__init__.py
===================================================================
--- debbugs-illa/bts/__init__.py	2006-04-18 16:58:52 UTC (rev 3590)
+++ debbugs-illa/bts/__init__.py	2006-04-18 17:10:31 UTC (rev 3591)
@@ -31,7 +31,7 @@
 from report import *
 
 class BtsInterface(BtsLdap):
-    def __init__(self, patterns, ldapurl = "ldap://bts2ldap.debian.net:10101"):
-        BtsLdap.__init__(self, patterns, ldapurl)
+    def __init__(self, ldapurl):
+        BtsLdap.__init__(self, ldapurl)
 
 __all__ = ['BtsInterface', 'BtsReport']

Modified: debbugs-illa/bts/report.py
===================================================================
--- debbugs-illa/bts/report.py	2006-04-18 16:58:52 UTC (rev 3590)
+++ debbugs-illa/bts/report.py	2006-04-18 17:10:31 UTC (rev 3591)
@@ -28,22 +28,24 @@
 # SUCH DAMAGE.
 ###############################################################################
 
-import ldap
+import ldap, sys
 
 class BtsLdap:
     dn = "dc=current,dc=bugs,dc=debian,dc=org"
 
-    def __init__(self, patterns, ldapurl):
+    def __init__(self, ldapurl):
         self.l = ldap.initialize(ldapurl)
         self.l.simple_bind_s()
-        self.patterns = patterns
 
     def search(self, filter):
         return [i[1] for i in self.l.search_s(BtsLdap.dn, ldap.SCOPE_SUBTREE, filter)]
 
-    def getReport(self, nb):
-        filter = ''.join(["(debbugsForwardedTo=" + (p % (nb)) + ")" for p in self.patterns])
-        l = self.search("(|%s)" % filter)
+    def getReportOfBzBug(self, bzurl, nb):
+        url = bzurl.rstrip('/')
+        filter = "(|(debbugsForwardedTo=%s/%s)(debbugsForwardedTo=%s/show_bug.cgi?id=%s))"
+        filter %= (url, nb, url, nb)
+
+        l = self.search(filter)
         if len(l) is 0:
             return None
         else:

Modified: debbugs-illa/bzlink.py
===================================================================
--- debbugs-illa/bzlink.py	2006-04-18 16:58:52 UTC (rev 3590)
+++ debbugs-illa/bzlink.py	2006-04-18 17:10:31 UTC (rev 3591)
@@ -219,10 +219,10 @@
 
 if __name__ == "__main__":
     BzMsg._debbugsUser = Config.User
-    btsi = bts.BtsInterface(Config.patterns, Config.Ldap)
+    btsi = bts.BtsInterface(Config.Ldap)
 
     def processBzMsg(bzm):
-        bug = btsi.getReport(bzm.bug)
+        bug = btsi.getReportOfBzBug(Config.Bugzilla, bzm.bug)
 
         if bug is None:
             # TODO: put the message in a queue for later processing

Modified: debbugs-illa/bzsync.py
===================================================================
--- debbugs-illa/bzsync.py	2006-04-18 16:58:52 UTC (rev 3590)
+++ debbugs-illa/bzsync.py	2006-04-18 17:10:31 UTC (rev 3591)
@@ -79,8 +79,8 @@
     bzBug = m.group(1)
 
     if len(sys.argv) is 2:
-        btsi = bts.BtsInterface(Config.patterns, Config.Ldap)
-        bug  = btsi.getReport(bzBug)
+        btsi = bts.BtsInterface(Config.Ldap)
+        bug  = btsi.getReportOfBzBug(Config.Bugzilla, bzBug)
         if bug is None:
             print >> sys.stderr, "Cannot find any debian bug forwarded to upstream bug %s" % bzBug
             sys.exit(1)

Modified: debbugs-illa/config.py
===================================================================
--- debbugs-illa/config.py	2006-04-18 16:58:52 UTC (rev 3590)
+++ debbugs-illa/config.py	2006-04-18 17:10:31 UTC (rev 3591)
@@ -30,10 +30,6 @@
 ###############################################################################
 
 class Config:
-    patterns = [ "http://bugs.kde.org/show_bug.cgi?id=%s",
-                 "http://bugs.kde.org/%s",
-                 "%s at bugs.kde.org" ]
-
     Bugzilla = "http://bugs.kde.org"
     Ldap = 'ldap://bts2ldap.debian.net:10101'
     From = 'debian-qt-kde at lists.debian.org'