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

eric at webkit.org eric at webkit.org
Wed Apr 7 23:50:01 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 65faec98f51304b55d418c211645b09c48a5d9d1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 21:02:30 2009 +0000

    2009-11-19  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Darin Adler.
    
            commit-queue empty queue logs twice
            https://bugs.webkit.org/show_bug.cgi?id=31679
    
            * Scripts/bugzilla-tool:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51203 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 53a5a39..abc850f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Darin Adler.
 
+        commit-queue empty queue logs twice
+        https://bugs.webkit.org/show_bug.cgi?id=31679
+
+        * Scripts/bugzilla-tool:
+
+2009-11-19  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Darin Adler.
+
         bugzilla-tool's reviewer/committer rejection message should be clearer
         https://bugs.webkit.org/show_bug.cgi?id=31126
 
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index bf05bb5..b1871d4 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -788,8 +788,11 @@ class CommitQueue(AbstractQueue):
 
     def next_work_item(self):
         patches = self.tool.bugs.fetch_patches_from_commit_queue(reject_invalid_patches=True)
+        if not patches:
+            return None
+        # Only bother logging if we have patches in the queue.
         self.log_progress([patch['id'] for patch in patches])
-        return patches[0] if patches else None
+        return patches[0]
 
     def should_proceed_with_work_item(self, patch):
         red_builders_names = self.tool.buildbot.red_core_builders_names()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list