[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 46d31d9eb3c15e27e4fe4917144a1cb4796ad4cf
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 17 20:11:33 2009 +0000

    2009-11-17  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Darin Adler.
    
            commit-queue is failing to set reviewer in ChangeLogs
            https://bugs.webkit.org/show_bug.cgi?id=31592
    
            * Scripts/bugzilla-tool: Clarify the "applying" log message.
            * Scripts/modules/bugzilla.py:
             - Add a new _validate_committer_and_reviewer function as a
               temporary solution until we can make a real Attachment object
               which knows how to fill in its committer/reviewer fields automatically.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51085 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 52b7212..ca9d5b3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-17  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        commit-queue is failing to set reviewer in ChangeLogs
+        https://bugs.webkit.org/show_bug.cgi?id=31592
+
+        * Scripts/bugzilla-tool: Clarify the "applying" log message.
+        * Scripts/modules/bugzilla.py:
+         - Add a new _validate_committer_and_reviewer function as a
+           temporary solution until we can make a real Attachment object
+           which knows how to fill in its committer/reviewer fields automatically.
+
 2009-11-17  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 427d054..c90c931 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -330,7 +330,7 @@ class WebKitLandingScripts:
     @classmethod
     def _land_patch(cls, patch, options, tool):
         tool.scm().update_webkit() # Update before every patch in case the tree has changed
-        log("Applying %s from bug %s." % (patch['id'], patch['bug_id']))
+        log("Applying patch %s from bug %s." % (patch['id'], patch['bug_id']))
         tool.scm().apply_patch(patch, force=options.non_interactive)
 
         # Make sure the tree is still green after updating, before building this patch.
diff --git a/WebKitTools/Scripts/modules/bugzilla.py b/WebKitTools/Scripts/modules/bugzilla.py
index f30dda3..3a9ca68 100644
--- a/WebKitTools/Scripts/modules/bugzilla.py
+++ b/WebKitTools/Scripts/modules/bugzilla.py
@@ -218,6 +218,7 @@ class Bugzilla:
         attachments = self.fetch_attachments_from_bug(bug_id)
         for attachment in attachments:
             if attachment['id'] == attachment_id:
+                self._validate_committer_and_reviewer(attachment)
                 return attachment
         return None # This should never be hit.
 
@@ -262,6 +263,13 @@ class Bugzilla:
     def _validate_committer(self, patch, reject_invalid_patches):
         return self._validate_setter_email(patch, 'committer', self.committers.committer_by_email, self.reject_patch_from_commit_queue, reject_invalid_patches)
 
+    # FIXME: This is a hack until we have a real Attachment object.
+    # _validate_committer and _validate_reviewer fill in the 'reviewer' and 'committer'
+    # keys which other parts of the code expect to be filled in.
+    def _validate_committer_and_reviewer(self, patch):
+        self._validate_reviewer(patch, reject_invalid_patches=False)
+        self._validate_committer(patch, reject_invalid_patches=False)
+
     def fetch_unreviewed_patches_from_bug(self, bug_id):
         unreviewed_patches = []
         for attachment in self.fetch_attachments_from_bug(bug_id):

-- 
WebKit Debian packaging