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

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ab2c7b2f9bd9b914975d0ba8a661e79435246b57
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 09:29:05 2010 +0000

    2010-01-18  Adam Barth  <abarth at webkit.org>
    
            Unreviewed "build" fix.
    
            * Scripts/webkitpy/bugzilla.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53396 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9d68aee..a6a42b7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-18  Adam Barth  <abarth at webkit.org>
 
+        Unreviewed "build" fix.
+
+        * Scripts/webkitpy/bugzilla.py:
+
+2010-01-18  Adam Barth  <abarth at webkit.org>
+
         Unreviewed.  Actually make land-safely mark commit-queue+ as
         discussed with Eric.
 
diff --git a/WebKitTools/Scripts/webkitpy/bugzilla.py b/WebKitTools/Scripts/webkitpy/bugzilla.py
index 7650bbe..50edf30 100644
--- a/WebKitTools/Scripts/webkitpy/bugzilla.py
+++ b/WebKitTools/Scripts/webkitpy/bugzilla.py
@@ -408,7 +408,7 @@ class Bugzilla(object):
             patch_name ="%s.patch" % timestamp()
         self.browser.add_file(patch_file_object, "text/plain", patch_name, 'data')
 
-    def add_patch_to_bug(self, bug_id, patch_file_object, description, comment_text=None, mark_for_review=False, mark_for_commit_queue=False):
+    def add_patch_to_bug(self, bug_id, patch_file_object, description, comment_text=None, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=False):
         self.authenticate()
 
         log('Adding patch "%s" to %sshow_bug.cgi?id=%s' % (description, self.bug_server_url, bug_id))
@@ -419,7 +419,7 @@ class Bugzilla(object):
 
         self.browser.open("%sattachment.cgi?action=enter&bugid=%s" % (self.bug_server_url, bug_id))
         self.browser.select_form(name="entryform")
-        self._fill_attachment_form(description, patch_file_object, mark_for_review=mark_for_review, mark_for_commit_queue=mark_for_commit_queue, bug_id=bug_id)
+        self._fill_attachment_form(description, patch_file_object, mark_for_review=mark_for_review, mark_for_commit_queue=mark_for_commit_queue, mark_for_landing=mark_for_landing, bug_id=bug_id)
         if comment_text:
             log(comment_text)
             self.browser['comment'] = comment_text

-- 
WebKit Debian packaging