[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c89f17d7549442064e0d43205fc331168e9fae0b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 21 03:14:51 2009 +0000

    2009-11-20  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            Fix exception thrown when running the commit-queue.
    
            * Scripts/modules/statusbot.py: patch is optional.
            * Scripts/modules/workqueue.py: WorkQUeue requires a name.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9b7ac30..4de1ca0 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Adam Barth.
 
+        Fix exception thrown when running the commit-queue.
+
+        * Scripts/modules/statusbot.py: patch is optional.
+        * Scripts/modules/workqueue.py: WorkQUeue requires a name.
+
+2009-11-20  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         Teach the StatusBot how to support more than just the commit-queue
         https://bugs.webkit.org/show_bug.cgi?id=31754
 
diff --git a/WebKitTools/Scripts/modules/statusbot.py b/WebKitTools/Scripts/modules/statusbot.py
index 048527a..3a69a7b 100644
--- a/WebKitTools/Scripts/modules/statusbot.py
+++ b/WebKitTools/Scripts/modules/statusbot.py
@@ -57,7 +57,7 @@ class StatusBot:
         self.statusbot_server_url = "http://%s" % self.statusbot_host
         self.browser = Browser()
 
-    def update_status(self, queue_name, status, patch):
+    def update_status(self, queue_name, status, patch=None):
         # During unit testing, statusbot_host is None
         if not self.statusbot_host:
             return
diff --git a/WebKitTools/Scripts/modules/workqueue.py b/WebKitTools/Scripts/modules/workqueue.py
index 44bd38f..8715e1d 100644
--- a/WebKitTools/Scripts/modules/workqueue.py
+++ b/WebKitTools/Scripts/modules/workqueue.py
@@ -148,6 +148,6 @@ class WorkQueue:
 
     def _update_status_and_sleep(self, message):
         status_message = self._sleep_message(message)
-        self.status_bot.update_status(status_message)
+        self.status_bot.update_status(self._name, status_message)
         log(status_message)
         time.sleep(self.seconds_to_sleep)

-- 
WebKit Debian packaging