[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 0e4a9747fbd52c36807581da9958427122222b15
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 00:49:00 2010 +0000

    2010-01-13  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            REGRESSION(53133): webkit-patch land dies if it can't find a bug id.
            https://bugs.webkit.org/show_bug.cgi?id=33634
    
            Deal with the case of no bug patch object in the state.
    
            * Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py:
            * Scripts/webkitpy/steps/updatechangelogswithreviewer.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53215 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 328ab22..b7c7bc0 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-13  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION(53133): webkit-patch land dies if it can't find a bug id.
+        https://bugs.webkit.org/show_bug.cgi?id=33634
+
+        Deal with the case of no bug patch object in the state.
+
+        * Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py:
+        * Scripts/webkitpy/steps/updatechangelogswithreviewer.py:
+
 2010-01-13  Kenneth Russell  <kbr at google.com>
 
         Unreviewed; added myself to the committers list.
diff --git a/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py b/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py
index 43daa22..102a454 100644
--- a/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py
+++ b/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py
@@ -29,12 +29,18 @@
 import unittest
 
 from webkitpy.steps.updatechangelogswithreviewer import UpdateChangeLogsWithReviewer
+from webkitpy.mock import Mock
 from webkitpy.mock_bugzillatool import MockBugzillaTool
 from webkitpy.outputcapture import OutputCapture
 
-class UpdateChangeLogsWithReviewerStepTest(unittest.TestCase):
+class UpdateChangeLogsWithReviewerTest(unittest.TestCase):
     def test_guess_reviewer_from_bug(self):
         capture = OutputCapture()
-        step = UpdateChangeLogsWithReviewer(MockBugzillaTool(), [])
+        step = UpdateChangeLogsWithReviewer(MockBugzillaTool(), Mock())
         expected_stderr = "0 reviewed patches on bug 75, cannot infer reviewer.\n"
         capture.assert_outputs(self, step._guess_reviewer_from_bug, [75], expected_stderr=expected_stderr)
+
+    def test_empty_state(self):
+        capture = OutputCapture()
+        step = UpdateChangeLogsWithReviewer(MockBugzillaTool(), Mock())
+        capture.assert_outputs(self, step.run, [{}])
diff --git a/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreviewer.py b/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreviewer.py
index 3c8797a..90fdc35 100644
--- a/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreviewer.py
+++ b/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreviewer.py
@@ -51,7 +51,9 @@ class UpdateChangeLogsWithReviewer(AbstractStep):
         return patch.reviewer().full_name
 
     def run(self, state):
-        bug_id = state.get("bug_id") or state["patch"].bug_id()
+        bug_id = state.get("bug_id")
+        if not bug_id and state.get("patch"):
+            bug_id = state.get("patch").bug_id()
 
         reviewer = self._options.reviewer
         if not reviewer:

-- 
WebKit Debian packaging