2009-11-16 Eric Seidel <eric@webkit.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Nov 2009 11:00:24 +0000 (11:00 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Nov 2009 11:00:24 +0000 (11:00 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@51022 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Scripts/bugzilla-tool

index f3a666105c300db6b50aa19c3bd206922ef4ddfb..a24b07a3c0136408c9fc861aeaf6802bcde05577 100644 (file)
@@ -1,3 +1,12 @@
+2009-11-16  Eric Seidel  <eric@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.
+
 2009-11-16  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Barth.
index 1dd364088838eb28ae2eca26da19b01be3e4ad4b..f1efeb0ce5e574f69137c64149194a4c1c813632 100755 (executable)
@@ -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.")