sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools/PatchCheck.py: Fix misreport for binary changes in patch

Browse Source 
For a patch file that:
1. Contains a binary change
2. Contains any other changes after the binary change

PatchCheck.py will complains with the following error:
* Patch format error: diff found after end of patch
   Line: literal XXXX

This commit resolves this misreport.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Hao Wu
2017-06-08 10:58:22 +08:00
parent 16bad1fbaf
commit aab57eff5a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BaseTools/Scripts/PatchCheck.py
View File

@ -1,7 +1,7 @@
## @file ## @file
# Check a patch for various format issues # Check a patch for various format issues
# #
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials are licensed and made # This program and the accompanying materials are licensed and made
# available under the terms and conditions of the BSD License which # available under the terms and conditions of the BSD License which
@ -265,7 +265,7 @@ class GitDiffCheck:
if line.startswith('@@ '): if line.startswith('@@ '):
self.state = PRE_PATCH self.state = PRE_PATCH
elif len(line) >= 1 and line[0] not in ' -+' and \ elif len(line) >= 1 and line[0] not in ' -+' and \
not line.startswith(r'\ No newline '): not line.startswith(r'\ No newline ') and not self.binary:
for line in self.lines[self.line_num + 1:]: for line in self.lines[self.line_num + 1:]:
if line.startswith('diff --git'): if line.startswith('diff --git'):
self.format_error('diff found after end of patch') self.format_error('diff found after end of patch')
@ -300,7 +300,7 @@ class GitDiffCheck:
elif self.state == PATCH: elif self.state == PATCH:
if self.binary: if self.binary:
pass pass
if line.startswith('-'): elif line.startswith('-'):
pass pass
elif line.startswith('+'): elif line.startswith('+'):
self.check_added_line(line[1:]) self.check_added_line(line[1:])