Merge lp:~therve/twisted-trac-integration/fix-review-branches into lp:~exarkun/twisted-trac-integration/trunk

[Thomas Herve]

The branch changes the 2 places remaining where TICKET_RULES is used, where it's expecting a single channel but get a list instead now.

[Jean-Paul Calderone (exarkun)]

Sorry for not writing unit tests for this code. Change looks good (someone in the future might want to combine multi-channel announcements, so trac only gets polled for data once instead of N times, but this is fine for now).

review: Approve

=== modified file 'commit-bot/ticket.py'
--- commit-bot/ticket.py	2012-05-25 20:16:04 +0000
+++ commit-bot/ticket.py	2012-07-09 13:25:20 +0000
@@ -70,13 +70,14 @@
 
     def privmsg(self, user, channel, message):
         if 'review branches' in message:
-            for (url, chan) in config.TICKET_RULES:
-                if chan == channel:
-                    d = self.reportReviewTickets(url, chan)
-                    d.addErrback(
-                        log.err,
-                        "Failed to satisfy review ticket request from "
-                        "%r to %r" % (url, chan))
+            for (url, channels) in config.TICKET_RULES:
+                for existing_channel in channels:
+                    if existing_channel == channel:
+                        d = self.reportReviewTickets(url, channel)
+                        d.addErrback(
+                            log.err,
+                            "Failed to satisfy review ticket request from "
+                            "%r to %r" % (url, channel))
 
 
     def connectionLost(self, reason):
@@ -88,12 +89,13 @@
         """
         Call L{reportReviewTickets} with each element of L{config.TICKET_RULES}.
         """
-        for (url, channel) in config.TICKET_RULES:
-            d = self.reportReviewTickets(url, channel)
-            d.addErrback(
-                log.err,
-                "Failed to report review tickets from %r to %r" % (
-                    url, channel))
+        for (url, channels) in config.TICKET_RULES:
+            for channel in channels:
+                d = self.reportReviewTickets(url, channel)
+                d.addErrback(
+                    log.err,
+                    "Failed to report review tickets from %r to %r" % (
+                        url, channel))
 
 
     def reportReviewTickets(self, trackerRoot, channel):