[edk2-devel] [PATCH v6 02/12] BaseTools/PatchCheck.py: Add PCCTS to tab exemption list

[Rebecca Cran]

Ah, but my patch was only for Makefiles: I didn't realize source files 
also contain tabs.

So we probably want a combination of our patches: yours to ignore the 
entire directory, and the change I made to also ignore files named 
"makefile" as well as "Makefile".

Could you update your patch with my 
"os.path.basename(self.filename).lower() == 'makefile' " change please?


-- 
Rebecca Cran


On 3/24/23 2:52 PM, Rebecca Cran wrote:
> I sent out a patch to fix this same issue earlier today!
>
> I took a slightly different approach: see "[edk2-devel] [PATCH v2 1/1] 
> BaseTools/Scripts/PatchCheck.py: Improve check for Makefiles"
>
>
> diff --git a/BaseTools/Scripts/PatchCheck.py 
> b/BaseTools/Scripts/PatchCheck.py
> index fcdabfc8acea..241467f10ea5 100755
> --- a/BaseTools/Scripts/PatchCheck.py
> +++ b/BaseTools/Scripts/PatchCheck.py
> @@ -383,7 +383,8 @@ class GitDiffCheck:
>                      self.force_crlf = False
>                      self.force_notabs = False
>                  if os.path.basename(self.filename) == 'GNUmakefile' or \
> -                   os.path.basename(self.filename) == 'Makefile':
> +                   os.path.basename(self.filename).lower() == 
> 'makefile' or \
> +                   os.path.splitext(self.filename)[1] == ".makefile":
>                      self.force_notabs = False
>              elif len(line.rstrip()) != 0:
>                  self.format_error("didn't find diff command")
>
>
> On 3/24/23 2:48 PM, Michael Kubacki wrote:
>> From: Michael Kubacki <michael.kubacki at microsoft.com>
>>
>> Purdue Compiler Construction Tool Set (PCCTS) source code was copied/
>> pasted into BaseTools/Source/C/VfrCompile/Pccts/.
>>
>> The code contains tab characters instead of spaces.
>>
>> PatchCheck.py gives an error on modifications to files that
>> contain tabs.
>>
>> This change adds that directory to the pre-existing list of
>> directories in which tab checks are ignored in PatchCheck.py.
>>
>> The goal of my upcoming change there is not to mix tabs and spaces
>> but to fix a bug while preserving its current formatting characters.
>>
>> Cc: Bob Feng <bob.c.feng at intel.com>
>> Cc: Liming Gao <gaoliming at byosoft.com.cn>
>> Cc: Michael D Kinney <michael.d.kinney at intel.com>
>> Cc: Sean Brogan <sean.brogan at microsoft.com>
>> Cc: Yuwei Chen <yuwei.chen at intel.com>
>> Signed-off-by: Michael Kubacki <michael.kubacki at microsoft.com>
>> Reviewed-by: Liming Gao <gaoliming at byosoft.com.cn>
>> Reviewed-by: Michael D Kinney <michael.d.kinney at intel.com>
>> ---
>>   BaseTools/Scripts/PatchCheck.py | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/BaseTools/Scripts/PatchCheck.py 
>> b/BaseTools/Scripts/PatchCheck.py
>> index fcdabfc8acea..84d56b8c8b70 100755
>> --- a/BaseTools/Scripts/PatchCheck.py
>> +++ b/BaseTools/Scripts/PatchCheck.py
>> @@ -383,7 +383,9 @@ class GitDiffCheck:
>>                       self.force_crlf = False
>>                       self.force_notabs = False
>>                   if os.path.basename(self.filename) == 'GNUmakefile' 
>> or \
>> -                   os.path.basename(self.filename) == 'Makefile':
>> +                   os.path.basename(self.filename) == 'Makefile' or \
>> +                   self.filename.startswith(
>> + 'BaseTools/Source/C/VfrCompile/Pccts/'):
>>                       self.force_notabs = False
>>               elif len(line.rstrip()) != 0:
>>                   self.format_error("didn't find diff command")
>
>
> 
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#101838): https://edk2.groups.io/g/devel/message/101838
Mute This Topic: https://groups.io/mt/97832892/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-