From 68513a70bcd92384395513322f1b801e7bf9c729 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 29 Sep 2010 17:32:26 +0100 Subject: Merge WebKit at r67908: Initial merge by Git Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972 --- WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py') diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py b/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py index 6cded27..327ac09 100644 --- a/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py +++ b/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py @@ -35,8 +35,9 @@ class ApplyPatch(AbstractStep): def options(cls): return AbstractStep.options() + [ Options.non_interactive, + Options.force_patch, ] def run(self, state): log("Processing patch %s from bug %s." % (state["patch"].id(), state["patch"].bug_id())) - self._tool.checkout().apply_patch(state["patch"], force=self._options.non_interactive) + self._tool.checkout().apply_patch(state["patch"], force=self._options.non_interactive or self._options.force_patch) -- cgit v1.1