From nobody Wed May 1 03:45:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42981+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42981+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1561705276; cv=none; d=zoho.com; s=zohoarc; b=iMvNIOsVN/hl4Fh38hZpu7XRg1OfTEJlsY3oU9OcSVzSUorXt2/znC5AC5zI6zb/Wm8S2dveYJIdvvQ0OTw/Lam5j/WqBXzQrBsFtw3lSmcmeSvVMxjJXtRq5wb6+vnFXsqZ0w4s1bz/6bn7vVrrm2rqUaxZ88nOB0OUVlYUquQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561705276; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=loGPEfgiWjxvGhpRq8hK62gsC/MpmEXOwHqFuZGqFDI=; b=UtWGsgPRIF3997NO5AVOzeksfCBJ1n+2D3JrSy7JcaQq/E0ZrGs7QELLCfYRnjDUwqPbxJkPSEX16KzjWDH5y/+bcq8usSKby28xWC7R7QPDP7n3mvc8YCosNyW+kdumoWEsyUHLz5SuL4R9eRbhgOFpqtl6f/+gIh740ysPRR8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42981+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1561705276549251.9233957696672; Fri, 28 Jun 2019 00:01:16 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Fri, 28 Jun 2019 00:01:15 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jun 2019 00:01:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,426,1557212400"; d="dat'59?scan'59,208,59";a="185538797" X-Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga004.fm.intel.com with ESMTP; 28 Jun 2019 00:01:14 -0700 X-Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 28 Jun 2019 00:01:14 -0700 X-Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 28 Jun 2019 00:01:14 -0700 X-Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.87]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.236]) with mapi id 14.03.0439.000; Fri, 28 Jun 2019 15:01:12 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [edk2-devel] [PATCH V2] BaseTools:Add the Judgment Method of "--exclude" Thread-Topic: [PATCH V2] BaseTools:Add the Judgment Method of "--exclude" Thread-Index: AdUtfxDdzO2I1db+RMSiTXD6vTQe9g== Date: Fri, 28 Jun 2019 07:01:11 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhijux.fan@intel.com Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF85347SHSMSX101ccrcor_" Content-Language: en-US DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1561705275; bh=48QYyUiwzAFGKzlkJ74QlffieBhXDI/59P8YlB1TwpY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=sXTukgbrh6loOUQMJbhYGaZ+ojE6p5WZEDmb5nBdrDiFQbknU8TsluE9Tasn2FHgk4/ qMDeFgM0P5PfR3RD9yh+7Jlm7phaHSpdOGynfDfG5WFEkWdvJpZMPIv5tZHQg0Ypcr36O UGp8uoqtEr5J/1CT6aF5JAa6dMXp/ple0Gk= X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: pass (identity @groups.io) --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF85347SHSMSX101ccrcor_ Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1944 --exclude cannot be used under certain circumstances 1.The value of the parameter USES an absolute path 2.The value of Exclude parameters is based on the value of the Path parameter Neither of these approaches currently works This patch is going to fix that issue. Cc: Liming Gao Cc: Bob Feng Signed-off-by: Zhiju.Fan --- keep original behavior on=20 --exclude for the directory name or file name. BaseTools/Scripts/FormatDosFiles.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/BaseTools/Scripts/FormatDosFiles.py b/BaseTools/Scripts/Format= DosFiles.py index d9a880f299..3150bef3c2 100644 --- a/BaseTools/Scripts/FormatDosFiles.py +++ b/BaseTools/Scripts/FormatDosFiles.py @@ -20,7 +20,7 @@ import copy =20 __prog__ =3D 'FormatDosFiles' __version__ =3D '%s Version %s' % (__prog__, '0.10 ') -__copyright__ =3D 'Copyright (c) 2018, Intel Corporation. All rights res= erved.' +__copyright__ =3D 'Copyright (c) 2018-2019, Intel Corporation. All right= s reserved.' __description__ =3D 'Convert source files to meet the EDKII C Coding Stand= ards Specification.\n' DEFAULT_EXT_LIST =3D ['.h', '.c', '.nasm', '.nasmb', '.asm', '.S', '.inf',= '.dec', '.dsc', '.fdf', '.uni', '.asl', '.aslc', '.vfr', '.idf', '.txt', '= .bat', '.py'] =20 @@ -46,10 +46,26 @@ def FormatFile(FilePath, Args): def FormatFilesInDir(DirPath, ExtList, Args): =20 FileList =3D [] + ExcludeDir =3D DirPath for DirPath, DirNames, FileNames in os.walk(DirPath): if Args.Exclude: DirNames[:] =3D [d for d in DirNames if d not in Args.Exclude] FileNames[:] =3D [f for f in FileNames if f not in Args.Exclud= e] + Continue =3D False + for Path in Args.Exclude: + if not os.path.isdir(Path) and not os.path.isfile(Path): + Path =3D os.path.join(ExcludeDir, Path) + if os.path.isdir(Path) and Path.endswith(DirPath): + DirNames[:] =3D [] + Continue =3D True + elif os.path.isfile(Path): + FilePaths =3D FileNames + for ItemPath in FilePaths: + FilePath =3D os.path.join(DirPath, ItemPath) + if Path.endswith(FilePath): + FileNames.remove(ItemPath) + if Continue: + continue for FileName in [f for f in FileNames if any(f.endswith(ext) for e= xt in ExtList)]: FileList.append(os.path.join(DirPath, FileName)) for File in FileList: --=20 2.14.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42981): https://edk2.groups.io/g/devel/message/42981 Mute This Topic: https://groups.io/mt/32239581/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF85347SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IlY8AQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADgxMzE1M0Y5 QkM5RjRCNDQ4NUMzQkIxNkI2NDIxOTgxABUHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBgAcAAcA AQALAAUAJAEBIIADAA4AAADjBwYAHAAHAAEACwAFACQBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABADwAAABbUEFUQ0ggVjJdIEJhc2VUb29sczpBZGQgdGhlIEp1ZGdtZW50 IE1ldGhvZCBvZiAiLS1leGNsdWRlIgCcEwELgAEAIQAAADgxMzE1M0Y5QkM5RjRCNDQ4NUMzQkIx NkI2NDIxOTgxABUHAQOQBgBQEAAANAAAAAIBfwABAAAASAAAADxGQUQwRDdFMEFFMEZBNTREOTg3 RjZFNzI0MzVDQUZENTBBRjg1MzQ3QFNIU01TWDEwMS5jY3IuY29ycC5pbnRlbC5jb20+AAsAHw4B AAAAAgEJEAEAAACNBgAAiQYAAFANAABMWkZ1dVw+XmEACmZiaWQEAABjY8BwZzEyNTIA/gND8HRl eHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjIOwliMTkOwL8JwxZyCjIW cQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2AhByAMB0fQhQbhoxECAF wAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJrbWsGcwGQACAgQk1fQuBF R0lOfQr8AfEL8SEfsFo6IGgCQHBzgDovL2J1Z3oDEEkLYC50BzBubwWhZQIuBbBnL3Nob3eCXyJh LmNnaT8N0EI9FnA0NFxsC4Bl0wqBJSQtLRAwYwpAAQCvG9AAcCMgBUBiGeB1EgB9HGB1HcAbshuB C3Eb0GnQcmN1bR9hbifgDgChJSQxLlRoGeB2B0C9ClAgGTAcwCnRCrFhB4DxG6JVU0UF8AORAaAZ IN8KQBAgKsEqkCUVMim8GXHfJkMq1wQgBAAm8GEnQgIg1yqDKgMlFSAqVlAskSrI+yUVB8BpKpEF wCpkEgArsPxwcANgANAzsRvQCHAJcOECMGx5IHcFsB9QJRyfKcAvUSyBEcAvQmdvC4DKZxzAbxxw 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 AABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfACNAAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBu AEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AIkABAAAACgAAAFMATQBUAFAAAAAAAAIB+T8BAAAA ZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAFMATQBU AFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAldAQAAACoA AAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAAsAQDoBAAAAHwAa AAEAAAASAAAASQBQAE0ALgBOAG8AdABlAAAAAAADAPE/CQQAAAsAQDoBAAAAAwD9P+QEAAACAQsw AQAAABAAAACBMVP5vJ9LRIXDuxa2QhmBAwAXAAEAAABAADkAgFV2RH8t1QFAAAgwkx3qRH8t1QEf AACAhgMCAAAAAADAAAAAAAAARgEAAAAeAAAAYQBjAGMAZQBwAHQAbABhAG4AZwB1AGEAZwBlAAAA AAABAAAADAAAAGUAbgAtAFUAUwAAAB8ANwABAAAAeAAAAFsAUABBAFQAQwBIACAAVgAyAF0AIABC AGEAcwBlAFQAbwBvAGwAcwA6AEEAZABkACAAdABoAGUAIABKAHUAZABnAG0AZQBuAHQAIABNAGUA dABoAG8AZAAgAG8AZgAgACIALQAtAGUAeABjAGwAdQBkAGUAIgAAAB8APQABAAAAAgAAAAAAAAAD ADYAAAAAAAIBcQABAAAAFgAAAAHVLX8Q3cztiNXW/kTEok1w+r00HvYAAB8AcAABAAAAeAAAAFsA UABBAFQAQwBIACAAVgAyAF0AIABCAGEAcwBlAFQAbwBvAGwAcwA6AEEAZABkACAAdABoAGUAIABK AHUAZABnAG0AZQBuAHQAIABNAGUAdABoAG8AZAAgAG8AZgAgACIALQAtAGUAeABjAGwAdQBkAGUA IgAAAB8ANRABAAAAkAAAADwARgBBAEQAMABEADcARQAwAEEARQAwAEYAQQA1ADQARAA5ADgANwBG ADYARQA3ADIANAAzADUAQwBBAEYARAA1ADAAQQBGADgANQAzADQANwBAAFMASABTAE0AUwBYADEA MAAxAC4AYwBjAHIALgBjAG8AcgBwAC4AaQBuAHQAZQBsAC4AYwBvAG0APgAAAAMA3j+fTgAAQAAH MDG850R/LdUBAgELAAEAAAAQAAAAgTFT+byfS0SFw7sWtkIZgQMAJgAAAAAAAgFHAAEAAAAzAAAA Yz1VUzthPU1DSTtwPUludGVsO2w9U0hTTVNYMTAxLTE5MDYyODA3MDExMVotMTQ4MjYAAAIBEDAB AAAARgAAAAAAAAAmd705O+w4SaSmFT3LpXtCBwD60Nfgrg+lTZh/bnJDXK/VAAAARBFeAACmk2g2 iHZsS6dK0+tHmkxkAAAJVI/UAAAAAB8A+j8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAA AAMACVkBAAAAQAAAgAggBgAAAAAAwAAAAAAAAEYAAAAAv4UAAJDwvEN/LdUBCwAAgAggBgAAAAAA wAAAAAAAAEYAAAAAgoUAAAAAAAADAACACCAGAAAAAADAAAAAAAAARgAAAADrhQAACQQAAB8AAICG AwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHAAcgBvAGQAdQBjAHQAAAABAAAAGgAAAGQA bABwAGUALQB3AGkAbgBkAG8AdwBzAAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAYAAAAZABs AHAALQB2AGUAcgBzAGkAbwBuAAAAAQAAABYAAAAxADEALgAwAC4ANgAwADAALgA3AAAAAAAfAACA hgMCAAAAAADAAAAAAAAARgEAAAAaAAAAZABsAHAALQByAGUAYQBjAHQAaQBvAG4AAAAAAAEAAAAU AAAAbgBvAC0AYQBjAHQAaQBvAG4AAAADAA00/T8AAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAACAA AAB4AC0AbQBzAC0AaABhAHMALQBhAHQAdABhAGMAaAAAAAEAAAACAAAAAAAAAB8AAICGAwIAAAAA AMAAAAAAAABGAQAAACIAAAB4AC0AbwByAGkAZwBpAG4AYQB0AGkAbgBnAC0AaQBwAAAAAAABAAAA IAAAAFsAMQAwAC4AMgAzADkALgAxADIANwAuADQAMABdAAAAPfQ= --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF85347SHSMSX101ccrcor_--