Guomin:
+ self.lines[self.line_num+1].endswith('160000\n') or
What means for this line?
Thanks
Liming
-----Original Message-----
From: Jiang, Guomin <guomin.ji...@intel.com>
Sent: 2020年7月21日 10:59
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.f...@intel.com>; Gao, Liming <liming....@intel.com>
Subject: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade
submodule.
When i upgrade openssl to 1.1.1g, error occurred when run PatchCheck.py.
The reason is that the submodule will end with LF, but it will check based on
file rule, it make no sense and need ignore the check.
Signed-off-by: Guomin Jiang <guomin.ji...@intel.com>
Cc: Bob Feng <bob.c.f...@intel.com>
Cc: Liming Gao <liming....@intel.com>
---
BaseTools/Scripts/PatchCheck.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py
index 7db0775d14d1..46b9936c6576 100755
--- a/BaseTools/Scripts/PatchCheck.py
+++ b/BaseTools/Scripts/PatchCheck.py
@@ -405,12 +405,16 @@ class GitDiffCheck:
#
self.force_crlf = False
if self.filename == '.gitmodules' or \
+ self.lines[self.line_num+1].endswith('160000\n') or
+ \
self.filename == 'BaseTools/Conf/diff.order':
#
# .gitmodules and diff orderfiles are used internally by
git
# use tabs and LF line endings. Do not enforce no tabs and
# do not enforce CR/LF line endings.
#
+ # When update submodule, it will encode with LF line and do
+ # not enforce CR/LF line endings.
+ #
self.force_crlf = False
self.force_notabs = False
elif len(line.rstrip()) != 0:
--
2.25.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#62960): https://edk2.groups.io/g/devel/message/62960
Mute This Topic: https://groups.io/mt/75697127/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
