[Lsb-messages] /var/www/bzr/lsb/devel/buildbot-config r252: Pre-check branches on email notifications.

Jeff Licquia licquia at linuxfoundation.org
Fri May 4 22:11:06 UTC 2012


------------------------------------------------------------
revno: 252
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: buildbot-config
timestamp: Fri 2012-05-04 18:11:06 -0400
message:
  Pre-check branches on email notifications.
modified:
  lfbuildbot.py
-------------- next part --------------
=== modified file 'lfbuildbot.py'
--- a/lfbuildbot.py	2012-05-04 20:57:55 +0000
+++ b/lfbuildbot.py	2012-05-04 22:11:06 +0000
@@ -376,12 +376,13 @@
         match = re.search(r'^\[Lsb-messages\] (\S+) r(\d+): (.+)$',
                           subject.strip())
         if match:
-            del m['subject']
-            m['subject'] = "[Branch %s] Rev %s: %s" % (match.group(1),
-                                                       match.group(2),
-                                                       match.group(3))
-
-            return BzrLaunchpadEmailMaildirSource.parse(self, m, prefix)
-
-        else:
-            return None
+            raw_branch = match.group(1)
+            if raw_branch in self.branchMap:
+                del m['subject']
+                m['subject'] = "[Branch %s] Rev %s: %s" % (raw_branch,
+                                                           match.group(2),
+                                                           match.group(3))
+
+                return BzrLaunchpadEmailMaildirSource.parse(self, m, prefix)
+
+        return None



More information about the lsb-messages mailing list