tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTools/PatchCheck: Ignore blank lines in diff

Browse Source 
https://bugzilla.tianocore.org/show_bug.cgi?id=2044

When fixes are made for incorrect line endings, there
are cases where the diff contains blank lines.  Ignore
these blank lines.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Michael D Kinney 2019-08-01 15:57:18 -07:00
parent 111bbcf876
commit 05579e5182
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BaseTools/Scripts/PatchCheck.py
View File

@ -270,6 +270,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\n') and \
not line.startswith(r'\ No newline ') and not self.binary: 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'):
@ -313,6 +314,8 @@ class GitDiffCheck:
pass pass
elif line.startswith('+'): elif line.startswith('+'):
self.check_added_line(line[1:]) self.check_added_line(line[1:])
elif line.startswith('\r\n'):
pass
elif line.startswith(r'\ No newline '): elif line.startswith(r'\ No newline '):
pass pass
elif not line.startswith(' '): elif not line.startswith(' '):