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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ce97ff7b2441584730e8b6738d25c228b1a03b29
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 20 19:32:44 2010 +0000

    2010-09-20  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Two instances of commit-queue try to process the same patch
            https://bugs.webkit.org/show_bug.cgi?id=46113
    
            This patch makes next-patch atomic so that the server won't vend the
            same patch twice in the same hour.
    
            * QueueStatusServer/handlers/nextpatch.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67871 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 134507c..15377b3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-20  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Two instances of commit-queue try to process the same patch
+        https://bugs.webkit.org/show_bug.cgi?id=46113
+
+        This patch makes next-patch atomic so that the server won't vend the
+        same patch twice in the same hour.
+
+        * QueueStatusServer/handlers/nextpatch.py:
+
 2010-09-20  Adam Roben  <aroben at apple.com>
 
         Make WebKitTestRunner's wait-to-dump watchdog timer work on Windows
diff --git a/WebKitTools/QueueStatusServer/handlers/nextpatch.py b/WebKitTools/QueueStatusServer/handlers/nextpatch.py
index 62c70a5..45be8bb 100644
--- a/WebKitTools/QueueStatusServer/handlers/nextpatch.py
+++ b/WebKitTools/QueueStatusServer/handlers/nextpatch.py
@@ -48,9 +48,17 @@ class NextPatch(webapp.RequestHandler):
         # Either there were no work items, or they're all active.
         return None
 
+    def _assign(self, queue_name, patch_id):
+        queue_status = queuestatus.QueueStatus()
+        queue_status.queue_name = queue_name
+        queue_status.active_patch_id = patch_id
+        queue_status.message = "Assigned for processing"
+        queue_status.put()
+
     def get(self, queue_name):
         patch_id = self._get_next_patch_id(queue_name)
         if not patch_id:
             self.error(404)
             return
+        self._assign(queue_name, patch_id)
         self.response.out.write(patch_id)

-- 
WebKit Debian packaging