summaryrefslogtreecommitdiff
path: root/tools/patman/gitutil.py
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-05-09 18:48:26 -0400
committerTom Rini <trini@ti.com>2014-05-09 18:48:26 -0400
commitf4617ef86dbbc2b844d530564694b927099bf0a9 (patch)
tree33dd41efabe14ad2ce99559f556fa6f22841f8a5 /tools/patman/gitutil.py
parentbcb879c0e37db1cf527ff408df93918f155012ea (diff)
parent097c5de5f4a64d3b121dc1dbe020f7f2545dabdb (diff)
Merge branch 'tom' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'tools/patman/gitutil.py')
-rw-r--r--tools/patman/gitutil.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index 5dcbaa3bd7..3ea256de2e 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -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):