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

BaseTools: PatchCheck: Exclude bash scripts from CRLF check

Browse Source 
Bash scripts require LF line endings to work.
PatchCheck.py checks that the files added in a patch have CRLF
line endings. It excludes files ending with the ".sh" extension
from this check.

Some bash script don't have a ".sh" extension. Most of them are
located in:
 - BaseTools/BinWrappers/PosixLike/
 - BaseTools/Bin/CYGWIN_NT-5.1-i686/

This patch excludes these folder plus BaseTools/BuildEnv from
this CRLF check.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>

Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
Pierre Gondois
2020-07-01 22:06:00 +08:00
committed by mergify[bot]
parent c8edb70945
commit 01356d2963
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BaseTools/Scripts/PatchCheck.py
View File

@ -3,6 +3,7 @@
# #
# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.<BR>
# Copyright (C) 2020, Red Hat, Inc.<BR> # Copyright (C) 2020, Red Hat, Inc.<BR>
# Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>
# #
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
@ -384,9 +385,14 @@ class GitDiffCheck:
self.is_newfile = False self.is_newfile = False
self.force_crlf = True self.force_crlf = True
self.force_notabs = True self.force_notabs = True
if self.filename.endswith('.sh'): if self.filename.endswith('.sh') or \
self.filename.startswith('BaseTools/BinWrappers/PosixLike/') or \
self.filename.startswith('BaseTools/Bin/CYGWIN_NT-5.1-i686/') or \
self.filename == 'BaseTools/BuildEnv':
# #
# Do not enforce CR/LF line endings for linux shell scripts. # Do not enforce CR/LF line endings for linux shell scripts.
# Some linux shell scripts don't end with the ".sh" extension,
# they are identified by their path.
# #
self.force_crlf = False self.force_crlf = False
if self.filename == '.gitmodules': if self.filename == '.gitmodules':