2010-04-10 Adam Barth <abarth@webkit.org>

        Reviewed by Eric Seidel.

        SheriffBot should spam when it encounters errors
        https://bugs.webkit.org/show_bug.cgi?id=37329

        We need to always update the status server so we don't get stuck in a
        spam loop.  I tried writing a test for this change, but it kind of
        got out of control.  We need a better way to do failure injection.

        * Scripts/webkitpy/tool/commands/sheriffbot.py:

Canonical link: https://commits.webkit.org/48719@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@57430 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog

@@ -1,3 +1,16 @@
+2010-04-10  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        SheriffBot should spam when it encounters errors
+        https://bugs.webkit.org/show_bug.cgi?id=37329
+
+        We need to always update the status server so we don't get stuck in a
+        spam loop.  I tried writing a test for this change, but it kind of
+        got out of control.  We need a better way to do failure injection.
+
+        * Scripts/webkitpy/tool/commands/sheriffbot.py:
+
 2010-04-10  Adam Barth  <abarth@webkit.org>
 
         Unreviewed attempt to fix the Chromium Mac canary.

WebKitTools/Scripts/webkitpy/tool/commands/sheriffbot.py

@@ -78,16 +78,18 @@ def should_proceed_with_work_item(self, new_failures):
     def process_work_item(self, new_failures):
         blame_list = new_failures.keys()
         for svn_revision, builders in new_failures.items():
-            commit_info = self.tool.checkout().commit_info_for_revision(svn_revision)
-            self._sheriff.post_irc_warning(commit_info, builders)
-            self._sheriff.post_blame_comment_on_bug(commit_info,
-                                                    builders,
-                                                    blame_list)
-            self._sheriff.post_automatic_rollout_patch(commit_info, builders)
-
-            for builder in builders:
-                self.tool.status_server.update_svn_revision(svn_revision,
-                                                            builder.name())
+            try:
+                commit_info = self.tool.checkout().commit_info_for_revision(svn_revision)
+                self._sheriff.post_irc_warning(commit_info, builders)
+                self._sheriff.post_blame_comment_on_bug(commit_info,
+                                                        builders,
+                                                        blame_list)
+                self._sheriff.post_automatic_rollout_patch(commit_info,
+                                                           builders)
+            finally:
+                for builder in builders:
+                    self.tool.status_server.update_svn_revision(svn_revision,
+                                                                builder.name())
         return True
 
     def handle_unexpected_error(self, new_failures, message):