From nobody Mon May 20 02:35:14 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+42915+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+42915+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1561604104; cv=none; d=zoho.com; s=zohoarc; b=HugPWOYfkeCy2PlHPbJ5mPPqLHV28ParuQV7SonCTIlkMDeL4mlN9N/jLkLBHSWncH+y4D3XXrrOkQUYAPQbS0FJnmEwALXdJ2OASHS7SLOqvnpYCioSkNy4f241B3nBN02SQk20g8GyVy0UQG3u8sTe+Ss+ysh7F85pyD9GUkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561604104; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=A678bOfjG6BLvXPpRboiSIQTcDDXxinePHgcIoE8TMw=; b=ivFUHDCNkJW6FNJ54gXbqu6iuTsSMTu2ajUSS9tkPlCct+szDL38iqQWmjGAjCgJpJimZKqe8BO5wc2vd/y9V3E8xm9zST42rjzC6qSgoWM1uTTGrKH1dGV5Er2vTrscZlGicr/8rk8UxXhKbEJJACG82+w2kyoWqD9S0HxB0Ww= 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+42915+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 1561604104643211.0584000695634; Wed, 26 Jun 2019 19:55:04 -0700 (PDT) Return-Path: X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by groups.io with SMTP; Wed, 26 Jun 2019 19:55:02 -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 orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2019 19:55:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,422,1557212400"; d="dat'59?scan'59,208,59";a="185105407" X-Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga004.fm.intel.com with ESMTP; 26 Jun 2019 19:55:01 -0700 X-Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 26 Jun 2019 19:55:00 -0700 X-Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 26 Jun 2019 19:54:57 -0700 X-Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 26 Jun 2019 19:54:57 -0700 X-Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.87]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.173]) with mapi id 14.03.0439.000; Thu, 27 Jun 2019 10:54:56 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [edk2-devel] [PATCH] BaseTools:Updata the Judgment Method of "--exclude" Thread-Topic: [PATCH] BaseTools:Updata the Judgment Method of "--exclude" Thread-Index: AdUsk7JItFlsklTWQi2SOJVElPpinA== Date: Thu, 27 Jun 2019 02:54:55 +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_FAD0D7E0AE0FA54D987F6E72435CAFD50AF85016SHSMSX101ccrcor_" Content-Language: en-US DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1561604103; bh=LLFLd1klxa/GDK+ReHEWy5uhqdSVkSu/RQP4lajeT3M=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Z66itgzAyzZTSdRyKc4YC9QV7ldzuqk4JFE40iP+CjW2lu8mhwDS3eGLzhCvFPx5X6j I87vOOfXOicOEiKBl6y+IrKKX0YoKrmkF5PhHZD9GSeWvUUg81OLUXwSxhN8Xs6kwWqoJ 77Ir+xdlgIP4BigzsbxXZT6ZxFN5C1zTPT0= X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: pass (identity @groups.io) --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF85016SHSMSX101ccrcor_ 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=20 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 --- BaseTools/Scripts/FormatDosFiles.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/BaseTools/Scripts/FormatDosFiles.py b/BaseTools/Scripts/Format= DosFiles.py index d9a880f299..7a5af209f2 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) 2019, Intel Corporation. All rights res= erved.' __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,22 @@ 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): + Continue =3D True + elif os.path.isfile(Path): + for ItemPath in FileNames[:]: + 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 (#42915): https://edk2.groups.io/g/devel/message/42915 Mute This Topic: https://groups.io/mt/32227595/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_FAD0D7E0AE0FA54D987F6E72435CAFD50AF85016SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IuQwAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADRCOEIyNTJB QTcxQjFGNDNBMkFCRjI0MzUwQ0NEMDc3ADUHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBgAbAAIA NgA3AAQAfgEBIIADAA4AAADjBwYAGwACADYANwAEAH4BAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABADwAAABbUEFUQ0hdIEJhc2VUb29sczpVcGRhdGEgdGhlIEp1ZGdtZW50 IE1ldGhvZCBvZiAiLS1leGNsdWRlIgBKFAELgAEAIQAAADRCOEIyNTJBQTcxQjFGNDNBMkFCRjI0 MzUwQ0NEMDc3ADUHAQOQBgDoDwAAMwAAAAIBfwABAAAASAAAADxGQUQwRDdFMEFFMEZBNTREOTg3 RjZFNzI0MzVDQUZENTBBRjg1MDE2QFNIU01TWDEwMS5jY3IuY29ycC5pbnRlbC5jb20+AAsAHw4B AAAAAgEJEAEAAABIBgAARAYAAJYMAABMWkZ1ec0KGGEACmZiaWQEAABjY8BwZzEyNTIA/gND8HRl eHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjIOwliMTkOwL8JwxZyCjIW cQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2AhByAMB0fQhQbhoxECAF wAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJrbWsGcwGQACAgQk1fQuBF R0lOfQr8AfEL8SEfsFo6IGgCQHBzgDovL2J1Z3oDEEkLYC50BzBubwWhZQIuBbBnL3Nob3eCXyJh LmNnaT8N0EI9FnA0NFxsC4Bl0wqBJSQtLRAwYwpAAQCvG9AAcCMgBUBiGeB1EgB9HGB1HcAbshuB C3Eb0GnQcmN1bR9hbifgDgChJSQxLlRoGeB2B0C9ClAgGTAcwCnRCrFhB4DxG6JVU0UF8AORAaAZ IN8KQBAgKsEqkCUVMim8GXHfJkMq1wQgBAAm8GEnQgIg1yqDKgQlFSAqVlAskSrI+yUVB8BpKpEF wCpkEgArsPxwcANgANAzwRvQCHAJcOECMGx5IHcFsB9QJRyfKcAvUSyBEcAvQmdvC4DKZxzAbxxw aXgqgRiAlS9BcwpQLiUcQ2MhwKZMB3A3kkdhN+A8JSBpOjIuZzqQQAuAECBsCyRQA3A+OWlCb2Ig VkYJ8DewPAbgYiRQLk5mPSE7fxTAaWcYUGRCLRkwZi1ieSHAWiE2oGp1LkYDkTx6vUAyeD3AAHA+ HyXhLTC2EkIvkVRvBvBzL1OrBQNDwEYa80QZEEYDEAkHkC5wNUB8IDE47CArRdxCmTE38R5wG9Dp GaNkLEWQNS9AAIAbgUJpAiBzKCspSFAzziABAB5wSPQtKSUcDeCdASAgJfAkcAVAYS9DT/tEXzVA YkwfTS9FUCUVHbEDEDBJoDlhODgwZgAyOTkuLjdhNXJhUeAwOVHgRZAeoDb/JPdCkUv/T29QeUXR Tl9VD5lQeUBAS5AB0Cw3RcD3WgNZwQdwcAkRG9FQlzCndF9fNDFnXJAxIF0UPfQgJ1hMJ1wYGjEA kAIgq1z1XZElBCBWX2QgYGAyJ2EAIChclkhQJzDuLh6QXaBKZi1ckFtSBRB+ZyHgXPNdkQhQY2Vh YGNcKSAB0EWgSFBJO5IgHQhQclsBGIBJAS4gQX0isCBjgwQgCXBIwRowZLouXqYrYy9kP2VAOWV/ /2aPZ51cgQEABPRflGmTG2P+IBkgCHAn4EeDBCA30QeAgxIQKoNFREtJSWtQ12tRDeA3oVMo0WQL EQZBHnAFkAaQDlBrxFxcbgFep0RFRkFVTFQIX0VYdNBMSVNUwV2BWycuaCdiASRQ1XXjbi+QbXZH YnXjdqb2U3XjC4BmdeMFgXjUBPCvdeMFcHjEJ4Bpd3Vseta9djR2A1B4VHo1DNB0deNnL4B9VEVQ J11bnVnCNNQ2LGJRK3+hMlLQWcHvAQE9ABrzRPIoRPIxskhQYQcQZ3MpOjC2gKxzdWsARChwKIQh gdQZcHT/OhAfYIIeMLddEUTyhSJ1cv9+ZlbgXREuJYQhXYGEZYZqrxrhiXZIUIQhTisBc0hQX0Ty i7NIkSpQRTB3B0Br34RWgnhdFgaQgiMuLiWChsdT4JCJi4ZbOl11chxh/wWxHGAoMYuGjvIcYCbC KDH/jzp+ZpB7jCeRxSpwirIqcP8oMYwpl0GTv5TJiGNdFhtBvSLwbioxXZBAgFeQZZov/4qFMbOZ LYKGmpuOxSbCjPH7LIJ4kHMN4IRAjaMrsZOk/6EoR5Kh9J8vkIoxs12QoSb6ajeBKIi4SFCNo6Q/ jpj3oS+iNTGyLgnwcqAD8CqQ541vqL+bLVRyClCs710VXzuwqcujj6//imdJECBt/53mlkqyr6jO gZamPoRntLb/qD+ozypwq3yBlrKfv3+WC+4uCXAEYBowKLpfn/2bZv++j10WG+Gbk44OirKMJoyy x5c/kyYAcHkoZqu4EDHfZRCKshAxjLKE9Sm2J7/P74cmd7A0IKvBKLj/geOMJv4pSmbHK8j2hSKP 91PgLMf8MTRiQI0QHbEj8EUwAFAHJSsVQtZQHwBCAAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoA dQBYAAAAHwBlAAEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBt AAAAAAAfAGQAAQAAAAoAAABTAE0AVABQAAAAAAACAUEAAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDd AQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBm AGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwACXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEA bgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAOVfAQAAADIAAABzAGkAcAA6AHoAaABpAGoAdQB4 AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAaDAEAAAAYAAAARgBhAG4ALAAgAFoA aABpAGoAdQBYAAAAHwAfDAEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAu AGMAbwBtAAAAAAAfAB4MAQAAAAoAAABTAE0AVABQAAAAAAACARkMAQAAAGQAAAAAAAAAgSsfpL6j EBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1 AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwABXQEAAAAqAAAAegBoAGkAagB1AHgA LgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAPg/AQAAABgAAABGAGEAbgAsACAAWgBo AGkAagB1AFgAAAAfACNAAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4A YwBvAG0AAAAAAB8AIkABAAAACgAAAFMATQBUAFAAAAAAAAIB+T8BAAAAZAAAAAAAAACBKx+kvqMQ GZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUA eAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAldAQAAACoAAAB6AGgAaQBqAHUAeAAu AGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAAsAQDoBAAAAHwAaAAEAAAASAAAASQBQAE0A LgBOAG8AdABlAAAAAAADAPE/CQQAAAsAQDoBAAAAAwD9P+QEAAACAQswAQAAABAAAABLiyUqpxsf Q6Kr8kNQzNB3AwAXAAEAAABAADkAgOndspMs1QFAAAgwOi35spMs1QEfAACAhgMCAAAAAADAAAAA AAAARgEAAAAeAAAAYQBjAGMAZQBwAHQAbABhAG4AZwB1AGEAZwBlAAAAAAABAAAADAAAAGUAbgAt AFUAUwAAAB8ANwABAAAAeAAAAFsAUABBAFQAQwBIAF0AIABCAGEAcwBlAFQAbwBvAGwAcwA6AFUA cABkAGEAdABhACAAdABoAGUAIABKAHUAZABnAG0AZQBuAHQAIABNAGUAdABoAG8AZAAgAG8AZgAg ACIALQAtAGUAeABjAGwAdQBkAGUAIgAAAB8APQABAAAAAgAAAAAAAAADADYAAAAAAAIBcQABAAAA FgAAAAHVLJOySLRZbJJU1kItkjiVRJT6YpwAAB8AcAABAAAAeAAAAFsAUABBAFQAQwBIAF0AIABC AGEAcwBlAFQAbwBvAGwAcwA6AFUAcABkAGEAdABhACAAdABoAGUAIABKAHUAZABnAG0AZQBuAHQA IABNAGUAdABoAG8AZAAgAG8AZgAgACIALQAtAGUAeABjAGwAdQBkAGUAIgAAAB8ANRABAAAAkAAA ADwARgBBAEQAMABEADcARQAwAEEARQAwAEYAQQA1ADQARAA5ADgANwBGADYARQA3ADIANAAzADUA QwBBAEYARAA1ADAAQQBGADgANQAwADEANgBAAFMASABTAE0AUwBYADEAMAAxAC4AYwBjAHIALgBj AG8AcgBwAC4AaQBuAHQAZQBsAC4AYwBvAG0APgAAAAMA3j+fTgAAQAAHMHpq9LKTLNUBAgELAAEA AAAQAAAAS4slKqcbH0Oiq/JDUMzQdwMAJgAAAAAAAgFHAAEAAAAzAAAAYz1VUzthPU1DSTtwPUlu dGVsO2w9U0hTTVNYMTAxLTE5MDYyNzAyNTQ1NVotMTMzNDQAAAIBEDABAAAARgAAAAAAAAAmd705 O+w4SaSmFT3LpXtCBwD60Nfgrg+lTZh/bnJDXK/VAAAARBFeAACmk2g2iHZsS6dK0+tHmkxkAAAJ VI/OAAAAAB8A+j8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAAMACVkBAAAAQAAAgAgg BgAAAAAAwAAAAAAAAEYAAAAAv4UAABBcSrKTLNUBCwAAgAggBgAAAAAAwAAAAAAAAEYAAAAAgoUA AAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAYAAAAZABsAHAALQBwAHIAbwBkAHUAYwB0AAAA AQAAABoAAABkAGwAcABlAC0AdwBpAG4AZABvAHcAcwAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYB AAAAGAAAAGQAbABwAC0AdgBlAHIAcwBpAG8AbgAAAAEAAAAWAAAAMQAxAC4AMAAuADYAMAAwAC4A NwAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAGgAAAGQAbABwAC0AcgBlAGEAYwB0AGkAbwBu AAAAAAABAAAAFAAAAG4AbwAtAGEAYwB0AGkAbwBuAAAAAwANNP0/AAAfAACAhgMCAAAAAADAAAAA AAAARgEAAAAgAAAAeAAtAG0AcwAtAGgAYQBzAC0AYQB0AHQAYQBjAGgAAAABAAAAAgAAAAAAAAAf AACAhgMCAAAAAADAAAAAAAAARgEAAAAiAAAAeAAtAG8AcgBpAGcAaQBuAGEAdABpAG4AZwAtAGkA cAAAAAAAAQAAACAAAABbADEAMAAuADIAMwA5AC4AMQAyADcALgA0ADAAXQAAAHzV --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF85016SHSMSX101ccrcor_--