Cleanup.

djmitche · Oct 30, 2009 · 5c9202b · 5c9202b
1 parent 7f95bee
commit 5c9202b
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/buildbot/status/words.py b/buildbot/status/words.py
@@ -323,32 +323,42 @@ def buildFinished(self, builderName, build, results):
             builder.category not in self.channel.categories):
             return
 
-        results = build.getResults()
+        if not self.notify_for_finished(build):
+            return
 
         r = "build #%d of %s is complete: %s" % \
             (build.getNumber(),
              builder.getName(),
-             self.results_descriptions.get(results, "??"))
+             self.results_descriptions.get(build.getResults(), "??"))
         r += " [%s]" % " ".join(build.getText())
         buildurl = self.channel.status.getURLForThing(build)
         if buildurl:
             r += "  Build details are at %s" % buildurl
 
-        if self.notify_for('finished') or self.notify_for(lower(self.results_descriptions.get(results))):
-            self.send(r)
-            return
+        self.send(r)
+
+    def notify_for_finished(self, build):
+        results = build.getResults()
+
+        if self.notify_for('finished'):
+            return True
+
+        if self.notify_for(lower(self.results_descriptions.get(results))):
+            return True
 
         prevBuild = build.getPreviousBuild()
         if prevBuild:
             prevResult = prevBuild.getResults()
 
-            required_notification_control_string = join((lower(self.results_descriptions.get(prevResult)), \
-                                                             'To', \
-                                                             capitalize(self.results_descriptions.get(results))), \
-                                                            '')
+            event = join((lower(self.results_descriptions.get(prevResult)), \
+                              'To', \
+                              capitalize(self.results_descriptions.get(results))), \
+                             '')
+
+            if (self.notify_for(event)):
+                return True
 
-            if (self.notify_for(required_notification_control_string)):
-                self.send(r)
+        return False
 
     def watchedBuildFinished(self, b):