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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 13:20:21 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit abd75c72d540158063999c3eb32ba57e8b63c955
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 17:09:07 2010 +0000

    2010-09-11  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix Python exception when generating synthetic patch IDs
            https://bugs.webkit.org/show_bug.cgi?id=45592
    
            Can't concatenate strings and numbers directly.
    
            * QueueStatusServer/handlers/queuestatus.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67302 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 88d112c..ee787e6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Adam Barth.
 
+        Fix Python exception when generating synthetic patch IDs
+        https://bugs.webkit.org/show_bug.cgi?id=45592
+
+        Can't concatenate strings and numbers directly.
+
+        * QueueStatusServer/handlers/queuestatus.py:
+
+2010-09-11  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Adam Barth.
+
         Group statuses in queue status by patch ID
         https://bugs.webkit.org/show_bug.cgi?id=45588
 
diff --git a/WebKitTools/QueueStatusServer/handlers/queuestatus.py b/WebKitTools/QueueStatusServer/handlers/queuestatus.py
index 6c6a3d0..86b2f26 100644
--- a/WebKitTools/QueueStatusServer/handlers/queuestatus.py
+++ b/WebKitTools/QueueStatusServer/handlers/queuestatus.py
@@ -59,7 +59,7 @@ class QueueStatus(webapp.RequestHandler):
             if status.active_patch_id:
                 patch_id = status.active_patch_id
             else:
-                patch_id = 'synthetic-' + synthetic_patch_id_counter
+                patch_id = 'synthetic-%d' % synthetic_patch_id_counter
                 synthetic_patch_id_counter += 1
 
             if patch_id not in status_groups_by_patch_id:

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list