[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2510ec08fc4a762283cd537bf7da3e77935ca6f2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 18:33:03 2010 +0000

    2010-08-09  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            EWS bots wait 2 minutes between patches
            https://bugs.webkit.org/show_bug.cgi?id=43731
    
            * Scripts/webkitpy/tool/bot/queueengine.py:
             - Don't sleep after failures.  This was a hold-over from
               an earlier design.
            * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
             - EWS bots were not properly reporting true/false from process_work_item.
               They were always returning None, thus false, thus always logging
               as a failure and sleeping 2 minutes after each patch.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 06cd019..72fc86b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-09  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        EWS bots wait 2 minutes between patches
+        https://bugs.webkit.org/show_bug.cgi?id=43731
+
+        * Scripts/webkitpy/tool/bot/queueengine.py:
+         - Don't sleep after failures.  This was a hold-over from
+           an earlier design.
+        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+         - EWS bots were not properly reporting true/false from process_work_item.
+           They were always returning None, thus false, thus always logging
+           as a failure and sleeping 2 minutes after each patch.
+
 2010-08-09  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py b/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py
index a1a66a1..36cbc5f 100644
--- a/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py
+++ b/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py
@@ -107,7 +107,8 @@ class QueueEngine:
                 self._open_work_log(work_item)
                 try:
                     if not self._delegate.process_work_item(work_item):
-                        self._sleep("Unable to process work item.")
+                        log("Unable to process work item.")
+                        continue
                 except ScriptError, e:
                     # Use a special exit code to indicate that the error was already
                     # handled in the child process and we should just keep looping.
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
index 9fbfda6..750bbfd 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
@@ -152,8 +152,8 @@ class AbstractCommitterOnlyEWS(AbstractEarlyWarningSystem):
     def process_work_item(self, patch):
         if not self._committers.committer_by_email(patch.attacher_email()):
             self._did_error(patch, "%s cannot process patches from non-committers :(" % self.name)
-            return
-        AbstractEarlyWarningSystem.process_work_item(self, patch)
+            return False
+        return AbstractEarlyWarningSystem.process_work_item(self, patch)
 
 
 class MacEWS(AbstractCommitterOnlyEWS):

-- 
WebKit Debian packaging