[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 995749c0a07a722807adbc19feb890d44694688f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 19 22:30:22 2010 +0000

    2010-01-19  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Unbreak --request-commit
            https://bugs.webkit.org/show_bug.cgi?id=33832
    
            * Scripts/webkitpy/bugzilla.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53496 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3d3b868..291d4a2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-19  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Unbreak --request-commit
+        https://bugs.webkit.org/show_bug.cgi?id=33832
+
+        * Scripts/webkitpy/bugzilla.py:
+
 2010-01-19  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/bugzilla.py b/WebKitTools/Scripts/webkitpy/bugzilla.py
index 0ec9ec5..bcc9caa 100644
--- a/WebKitTools/Scripts/webkitpy/bugzilla.py
+++ b/WebKitTools/Scripts/webkitpy/bugzilla.py
@@ -404,8 +404,14 @@ class Bugzilla(object):
         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 mark_for_landing:
+            self.browser['flag_type-3'] = ('+',)
+        elif mark_for_commit_queue:
+            self.browser['flag_type-3'] = ('?',)
+        else:
+            self.browser['flag_type-3'] = ('X',)
+
         if bug_id:
             patch_name = "bug-%s-%s.patch" % (bug_id, timestamp())
         else:

-- 
WebKit Debian packaging