Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1142)

Unified Diff: Tools/Scripts/webkitpy/tool/commands/stepsequence.py

Issue 15416008: Remove a bunch of dead code from webkitpy (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Tools/Scripts/webkitpy/tool/commands/bugfortest.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/tool/commands/stepsequence.py
diff --git a/Tools/Scripts/webkitpy/tool/commands/stepsequence.py b/Tools/Scripts/webkitpy/tool/commands/stepsequence.py
index 1668cdb63b29fe00b932873026d717e84d53db1d..894771276e16991a5df1cba81a8f15eb985accb0 100644
--- a/Tools/Scripts/webkitpy/tool/commands/stepsequence.py
+++ b/Tools/Scripts/webkitpy/tool/commands/stepsequence.py
@@ -1,9 +1,9 @@
# Copyright (C) 2009 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -27,12 +27,12 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import logging
+import sys
from webkitpy.tool import steps
from webkitpy.common.checkout.scm import CheckoutNeedsUpdate
from webkitpy.common.system.executive import ScriptError
-from webkitpy.tool.bot.queueengine import QueueEngine
_log = logging.getLogger(__name__)
@@ -66,6 +66,14 @@ class StepSequence(object):
for step in self._steps:
step(tool, options).run(state)
+ # Child processes exit with a special code to the parent queue process can detect the error was handled.
+ handled_error_code = 2
+
+ @classmethod
+ def exit_after_handled_error(cls, error):
+ _log.error(error)
+ sys.exit(cls.handled_error_code)
+
def run_and_handle_errors(self, tool, options, state=None):
if not state:
state = {}
@@ -76,11 +84,11 @@ class StepSequence(object):
if options.parent_command:
command = tool.command_by_name(options.parent_command)
command.handle_checkout_needs_update(tool, state, options, e)
- QueueEngine.exit_after_handled_error(e)
+ self.exit_after_handled_error(e)
except ScriptError, e:
if not options.quiet:
_log.error(e.message_with_output())
if options.parent_command:
command = tool.command_by_name(options.parent_command)
command.handle_script_error(tool, state, e)
- QueueEngine.exit_after_handled_error(e)
+ self.exit_after_handled_error(e)
« no previous file with comments | « Tools/Scripts/webkitpy/tool/commands/bugfortest.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698