[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 9342249ebc7364b723962c9a50015907561fd00a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 11:00:24 2009 +0000

    2009-11-16  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            land-patches needs to be re-factored into smaller chunks
            https://bugs.webkit.org/show_bug.cgi?id=31532
    
            * Scripts/bugzilla-tool: fix a couple obvious typos.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51022 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f3a6661..a24b07a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -5,6 +5,15 @@
         land-patches needs to be re-factored into smaller chunks
         https://bugs.webkit.org/show_bug.cgi?id=31532
 
+        * Scripts/bugzilla-tool: fix a couple obvious typos.
+
+2009-11-16  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        land-patches needs to be re-factored into smaller chunks
+        https://bugs.webkit.org/show_bug.cgi?id=31532
+
         The next patch will move these methods into WebKitLandingScripts.
 
         * Scripts/bugzilla-tool:
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 1dd3640..f1efeb0 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -382,10 +382,10 @@ class LandPatchesFromBugs(Command):
         exit(2) # Exit 2 insted of 1 to indicate to the commit-queue to indicate we handled the error, and that the queue should keep looping.
 
     @classmethod
-    def _close_bug_if_no_active_patches(cls, patch, option, tool):
+    def _close_bug_if_no_active_patches(cls, bugs, bug_id):
         # This should check to make sure there are no r? or r+ patches on the bug before closing.
         # https://bugs.webkit.org/show_bug.cgi?id=28230
-        tool.bugs.close_bug_as_fixed(bug_id, "All reviewed patches have been landed.  Closing bug.")
+        bugs.close_bug_as_fixed(bug_id, "All reviewed patches have been landed.  Closing bug.")
 
     @classmethod
     def _land_patch(cls, patch, options, tool):
@@ -405,7 +405,7 @@ class LandPatchesFromBugs(Command):
             for patch in patches:
                 cls._land_patch(patch, options, tool)
             if options.close_bug and patches:
-                cls._close_bug_if_no_active_patches(patches[0]['bug_id'])
+                cls._close_bug_if_no_active_patches(tool.bugs, patches[0]['bug_id'])
         except CheckoutNeedsUpdate, e:
             log("Commit failed because the checkout is out of date.  Please update and try again.")
             log("You can pass --no-build to skip building/testing after update if you believe the new commits did not affect the results.")

-- 
WebKit Debian packaging