[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 b32ca1f3ea6c62430e2cf6d600fe931b36317e94
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 09:15:35 2010 +0000

    2010-01-18  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.  Actually make land-safely mark commit-queue+ as
            discussed with Eric.
    
            * Scripts/webkitpy/bugzilla.py:
            * Scripts/webkitpy/steps/postdiffforcommit.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53395 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6361b4e..9d68aee 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-18  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed.  Actually make land-safely mark commit-queue+ as
+        discussed with Eric.
+
+        * Scripts/webkitpy/bugzilla.py:
+        * Scripts/webkitpy/steps/postdiffforcommit.py:
+
 2010-01-17  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/webkitpy/bugzilla.py b/WebKitTools/Scripts/webkitpy/bugzilla.py
index a66613c..7650bbe 100644
--- a/WebKitTools/Scripts/webkitpy/bugzilla.py
+++ b/WebKitTools/Scripts/webkitpy/bugzilla.py
@@ -396,11 +396,12 @@ class Bugzilla(object):
 
         self.authenticated = True
 
-    def _fill_attachment_form(self, description, patch_file_object, comment_text=None, mark_for_review=False, mark_for_commit_queue=False, bug_id=None):
+    def _fill_attachment_form(self, description, patch_file_object, comment_text=None, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=False, bug_id=None):
         self.browser['description'] = description
         self.browser['ispatch'] = ("1",)
         self.browser['flag_type-1'] = ('?',) if mark_for_review else ('X',)
         self.browser['flag_type-3'] = ('?',) if mark_for_commit_queue else ('X',)
+        self.browser['flag_type-3'] = ('+',) if mark_for_landing else ('X',)
         if bug_id:
             patch_name = "bug-%s-%s.patch" % (bug_id, timestamp())
         else:
diff --git a/WebKitTools/Scripts/webkitpy/steps/postdiffforcommit.py b/WebKitTools/Scripts/webkitpy/steps/postdiffforcommit.py
index daabc08..449381c 100644
--- a/WebKitTools/Scripts/webkitpy/steps/postdiffforcommit.py
+++ b/WebKitTools/Scripts/webkitpy/steps/postdiffforcommit.py
@@ -38,4 +38,4 @@ class PostDiffForCommit(AbstractStep):
             StringIO.StringIO(self.cached_lookup(state, "diff")),
             "Patch for landing",
             mark_for_review=False,
-            mark_for_commit_queue=True)
+            mark_for_landing=True)

-- 
WebKit Debian packaging