From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by mx.groups.io with SMTP id smtpd.web11.8377.1679691154208487843 for ; Fri, 24 Mar 2023 13:52:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm3 header.b=j/KmQIcj; spf=pass (domain: bsdio.com, ip: 64.147.123.25, mailfrom: rebecca@bsdio.com) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 152A53200065; Fri, 24 Mar 2023 16:52:32 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 24 Mar 2023 16:52:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1679691151; x=1679777551; bh=ZJ1gE9mRGzA1DVYboR7mdO8hv9lkP5ZLlrF MZ8e8zvc=; b=j/KmQIcjB75LwQXGn0oW1bj0xZLB1AQMQYdPMjHQL6HqhPQyEYf PnwTvgTm9lOgjD9NTII5y0PcNqW4FmtchbOAQQWN701BVg9ZpoUYDmLEZgQvWRf9 7jZRfgGeLBV4fYDQwhzq+HVW8lHv6oUK7BKYPcRRxsiyTrbICeVjGl8Bk6ANKzOO jSR8IS7ugRfRTq1ihD1bXW5jCb8xHOS/2BHRwOKWKp+x0iGg7/oxTR7UaCRPZEeu 8cWTMaZqDIP8p9TzzdPcSsFbMkGv6SPfdstxRQ94jAmCCsUKYNLsVofLPiQxabK8 jG8Ofwlj/xvXmqn57yhqQ5gHzTZo2eEVokw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1679691151; x=1679777551; bh=ZJ1gE9mRGzA1DVYboR7mdO8hv9lkP5ZLlrF MZ8e8zvc=; b=oPOPdQsGVmIBdxje/d+6L1XXjV0Y03kggSzN0gMCHRlqqzeL2QZ qCfoOB/V9R1FQUJ/2hNOl3QfGa6UgdyEnip4FRqOzDDlLDX0MBUS3WOPUfemu/gp Jum3a7QajHkcqA3R9W4uJ4vr5TJ0wBgukgfEDfDrk9jf3r3CXY+MW9zrrAgSUqc8 mhPti1MWtV7Hbd9R0GGIpGGaYCfpZxc3M/fIkjYODwL8SGoNKLI7q4pDEET6hpr3 Dr4rwVEkSRgyXq2jmazINiGAmlZoMpn7FlDzHDCyXYfA2N1ZmgADuxqfrguivavQ asXgUnyOoATl8JMtO6GCn2JTVnPDVGfEz6w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdegiedgudegfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttdefjeenucfhrhhomheptfgv sggvtggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrf grthhtvghrnhepheelkefgudetudegheegfffghfetfefhhfetteefveehgfdvjeehtdfh ffeiffelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh eprhgvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 24 Mar 2023 16:52:30 -0400 (EDT) Message-ID: <55aa4966-abbe-ceb8-a1e2-60a5980136dc@bsdio.com> Date: Fri, 24 Mar 2023 14:52:29 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [edk2-devel] [PATCH v6 02/12] BaseTools/PatchCheck.py: Add PCCTS to tab exemption list To: devel@edk2.groups.io, mikuback@linux.microsoft.com Cc: Bob Feng , Liming Gao , Michael D Kinney , Sean Brogan , Yuwei Chen References: <20230324204838.1485-1-mikuback@linux.microsoft.com> <20230324204838.1485-3-mikuback@linux.microsoft.com> From: "Rebecca Cran" In-Reply-To: <20230324204838.1485-3-mikuback@linux.microsoft.com> Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 > > 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 > Cc: Liming Gao > Cc: Michael D Kinney > Cc: Sean Brogan > Cc: Yuwei Chen > Signed-off-by: Michael Kubacki > Reviewed-by: Liming Gao > Reviewed-by: Michael D Kinney > --- > 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")