tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools PatchCheck.py: Support binary diff 

This allows a patch with binary data that is generated with --binary
to be parsed by the PatchCheck.py script.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19104 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jordan Justen 2015-12-03 08:18:00 +00:00 committed by jljusten
parent 5d9cd24ede
commit 103733f8e6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BaseTools/Scripts/PatchCheck.py
View File

@ -285,6 +285,10 @@ class GitDiffCheck:
self.set_filename(line[6:].rstrip()) self.set_filename(line[6:].rstrip())
if line.startswith('@@ '): if line.startswith('@@ '):
self.state = PATCH self.state = PATCH
self.binary = False
elif line.startswith('GIT binary patch'):
self.state = PATCH
self.binary = True
else: else:
ok = False ok = False
for pfx in self.pre_patch_prefixes: for pfx in self.pre_patch_prefixes:
@ -294,6 +298,8 @@ class GitDiffCheck:
self.format_error("didn't find diff hunk marker (@@)") self.format_error("didn't find diff hunk marker (@@)")
self.line_num += 1 self.line_num += 1
elif self.state == PATCH: elif self.state == PATCH:
if self.binary:
pass
if line.startswith('-'): if line.startswith('-'):
pass pass
elif line.startswith('+'): elif line.startswith('+'):