Title: [122540] trunk/Tools
Revision
122540
Author
[email protected]
Date
2012-07-12 22:08:23 -0700 (Thu, 12 Jul 2012)

Log Message

Fix crash in the commit-queue.  We need to initialize self.port during __init__.

* Scripts/webkitpy/tool/commands/queues.py:
(CommitQueue.__init__):
(CommitQueue.begin_work_queue):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (122539 => 122540)


--- trunk/Tools/ChangeLog	2012-07-13 04:31:56 UTC (rev 122539)
+++ trunk/Tools/ChangeLog	2012-07-13 05:08:23 UTC (rev 122540)
@@ -1,3 +1,11 @@
+2012-07-12  Adam Barth  <[email protected]>
+
+        Fix crash in the commit-queue.  We need to initialize self.port during __init__.
+
+        * Scripts/webkitpy/tool/commands/queues.py:
+        (CommitQueue.__init__):
+        (CommitQueue.begin_work_queue):
+
 2012-07-12  Dirk Pranke  <[email protected]>
 
         test-webkitpy: rename test_finder to finder

Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (122539 => 122540)


--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py	2012-07-13 04:31:56 UTC (rev 122539)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py	2012-07-13 05:08:23 UTC (rev 122540)
@@ -260,14 +260,15 @@
     name = "commit-queue"
     port_name = "chromium-xvfb"
 
+    def __init__(self):
+        AbstractPatchQueue.__init__(self)
+        self.port = DeprecatedPort.port(self.port_name)
+
     # AbstractPatchQueue methods
 
     def begin_work_queue(self):
-        if not self._options.port:
-            self.port = DeprecatedPort.port(self.port_name)
-            # FIXME: This violates abstraction
-            self._tool._deprecated_port = self.port
-
+        # FIXME: This violates abstraction
+        self._tool._deprecated_port = self.port
         AbstractPatchQueue.begin_work_queue(self)
         self.committer_validator = CommitterValidator(self._tool)
         self._expected_failures = ExpectedFailures()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to