[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9b162d23c2d86f40db037f32569c8d4055d7ff58
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 13:34:54 2009 +0000

    2009-11-16  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            The commit-queue should use land-attachment
            https://bugs.webkit.org/show_bug.cgi?id=31548
    
            * Scripts/bugzilla-tool:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5f667e5..2b32a3b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-16  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        The commit-queue should use land-attachment
+        https://bugs.webkit.org/show_bug.cgi?id=31548
+
+        * Scripts/bugzilla-tool:
+
 2009-11-16  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 5221b2a..3ec72d1 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -805,24 +805,13 @@ class CommitQueue(AbstractQueue):
         if red_builders_names:
             red_builders_names = map(lambda name: '"%s"' % name, red_builders_names) # Add quotes around the names.
             return (False, "Builders [%s] are red. See http://build.webkit.org." % ", ".join(red_builders_names), None)
-        return (True, "Landing patches from bug %s." % patch['bug_id'], patch['bug_id'])
+        return (True, "Landing patch %s from bug %s." % (patch['id'], patch['bug_id']), patch['bug_id'])
 
     def process_work_item(self, patch):
-        self.run_bugzilla_tool(['land-patches', '--force-clean', '--commit-queue', '--quiet', patch['bug_id']])
+        self.run_bugzilla_tool(['land-attachment', '--force-clean', '--commit-queue', '--quiet', patch['id']])
 
     def handle_unexpected_error(self, patch, message):
-        # We don't have a patch id at this point, so try to grab the first patch off
-        # of the bug in question.  We plan to update the commit-queue to opearate
-        # off of patch ids in the near future.
-        bug_id = patch['bug_id']
-        patches = self.tool.bugs.fetch_commit_queue_patches_from_bug(bug_id)
-        non_obsolete_patches = filter(lambda patch: not patch['is_obsolete'], patches)
-        if not len(non_obsolete_patches):
-            # If there are no patches left on the bug, assume land-patches already closed it before dying, and just continue.
-            log(message)
-            return
-        bug_id = non_obsolete_patches[0]['id']
-        self.tool.bugs.reject_patch_from_commit_queue(bug_id, message)
+        self.tool.bugs.reject_patch_from_commit_queue(patch['id'], message)
 
 
 class StyleQueue(AbstractQueue):

-- 
WebKit Debian packaging