Commit 757f64a8 authored by Simon Glass's avatar Simon Glass
Browse files

patman: Deal with 'git apply' failures correctly



This sort of failure is rare, but the code to deal with it is wrong.
Fix it.
Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
parent 75b3c3aa
......@@ -11,6 +11,7 @@ import subprocess
import sys
import terminal
import checkpatch
import settings
......@@ -193,6 +194,7 @@ def ApplyPatch(verbose, fname):
Args:
fname: filename of patch file to apply
"""
col = terminal.Color()
cmd = ['git', 'am', fname]
pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
......@@ -203,8 +205,8 @@ def ApplyPatch(verbose, fname):
print line
match = re_error.match(line)
if match:
print GetWarningMsg('warning', match.group(1), int(match.group(2)),
'Patch failed')
print checkpatch.GetWarningMsg(col, 'warning', match.group(1),
int(match.group(2)), 'Patch failed')
return pipe.returncode == 0, stdout
def ApplyPatches(verbose, args, start_point):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment