From: "Rebecca Cran" <rebecca@bsdio.com>
To: devel@edk2.groups.io, mikuback@linux.microsoft.com
Cc: Bob Feng <bob.c.feng@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
Michael D Kinney <michael.d.kinney@intel.com>,
Sean Brogan <sean.brogan@microsoft.com>,
Yuwei Chen <yuwei.chen@intel.com>
Subject: Re: [edk2-devel] [PATCH v6 02/12] BaseTools/PatchCheck.py: Add PCCTS to tab exemption list
Date: Fri, 24 Mar 2023 14:52:29 -0600 [thread overview]
Message-ID: <55aa4966-abbe-ceb8-a1e2-60a5980136dc@bsdio.com> (raw)
In-Reply-To: <20230324204838.1485-3-mikuback@linux.microsoft.com>
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@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@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> Reviewed-by: Michael D Kinney <michael.d.kinney@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")
next prev parent reply other threads:[~2023-03-24 20:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-24 20:48 [PATCH v6 00/12] Enable New CodeQL Queries Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 01/12] MdeModulePkg/SmbiosDxe: Fix pointer and buffer overflow CodeQL alerts Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 02/12] BaseTools/PatchCheck.py: Add PCCTS to tab exemption list Michael Kubacki
2023-03-24 20:52 ` Rebecca Cran [this message]
[not found] ` <174F7634AC74F535.7603@groups.io>
2023-03-24 20:56 ` [edk2-devel] " Rebecca Cran
2023-03-24 21:27 ` Michael Kubacki
2023-03-24 22:33 ` Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 03/12] BaseTools/VfrCompile: Fix potential buffer overwrites Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 04/12] CryptoPkg: Fix conditionally uninitialized variable Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 05/12] MdeModulePkg: Fix conditionally uninitialized variables Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 06/12] MdePkg: " Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 07/12] NetworkPkg: " Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 08/12] PcAtChipsetPkg: " Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 09/12] ShellPkg: " Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 10/12] UefiCpuPkg: " Michael Kubacki
2023-03-24 21:16 ` Michael D Kinney
2023-03-24 20:48 ` [PATCH v6 11/12] .github/codeql/edk2.qls: Enable CWE 457, 676, and 758 queries Michael Kubacki
2023-03-24 20:48 ` [PATCH v6 12/12] .github/codeql/edk2.qls: Enable CWE 120, 787, and 805 queries Michael Kubacki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55aa4966-abbe-ceb8-a1e2-60a5980136dc@bsdio.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox