commit 0c3e9c1215dc734126003dcccdb7abc2d374b50f
author Simon Glass <sjg@chromium.org> Sun Apr 20 10:50:13 2014 -0600
committer Simon Glass <sjg@chromium.org> Fri May 09 14:50:39 2014 -0600
tree 280c8024a0922ccf485d55cd2995855f420d993d
parent 53552c9ece4af1fa48d6d2046721ee8f3a11e80a

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: Simon Glass <sjg@chromium.org>

tools/patman/gitutil.py

diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index 5dcbaa3..3ea256d 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -11,6 +11,7 @@
 import sys
 import terminal
 
+import checkpatch
 import settings
 
 
@@ -193,6 +194,7 @@
     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 @@
             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):