From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: zhijux.fan@intel.com) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Thu, 19 Sep 2019 00:45:46 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Sep 2019 00:45:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,522,1559545200"; d="dat'59?scan'59,208,59";a="189526022" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga003.jf.intel.com with ESMTP; 19 Sep 2019 00:45:45 -0700 Received: from fmsmsx154.amr.corp.intel.com (10.18.116.70) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Sep 2019 00:45:31 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX154.amr.corp.intel.com (10.18.116.70) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Sep 2019 00:45:31 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.92]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.146]) with mapi id 14.03.0439.000; Thu, 19 Sep 2019 15:45:29 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH] BaseTools:"--exclude" don't apply if parameter ends with separator Thread-Topic: [PATCH] BaseTools:"--exclude" don't apply if parameter ends with separator Thread-Index: AdVuvjPs0FPAGle2SrC/1eeX3X4cAA== Date: Thu, 19 Sep 2019 07:45:28 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 47564 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBDC08SHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBDC08SHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1944 FormatDosFiles.py Intel\ServerSiliconPkg --exclude Library\SimRegisters\ Its parameter "Library\SimRegisters\" ends with '\' but I can't seem to get it to exclude the SimRegisters directory This patch is going to fix this issue Cc: Liming Gao Cc: Bob Feng Signed-off-by: Zhiju.Fan --- BaseTools/Scripts/FormatDosFiles.py | 1 + 1 file changed, 1 insertion(+) diff --git a/BaseTools/Scripts/FormatDosFiles.py b/BaseTools/Scripts/Format= DosFiles.py index 3150bef3c2..e119334ded 100644 --- a/BaseTools/Scripts/FormatDosFiles.py +++ b/BaseTools/Scripts/FormatDosFiles.py @@ -53,6 +53,7 @@ def FormatFilesInDir(DirPath, ExtList, Args): FileNames[:] =3D [f for f in FileNames if f not in Args.Exclud= e] Continue =3D False for Path in Args.Exclude: + Path =3D Path.strip('\\').strip('/') 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): --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBDC08SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IuJlAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADYzMEU0MzQ0 MTc5RUU1NDBCMTBFMDQ1MkI5NjYzQUZBAAYHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHCQATAAcA LQAcAAQAWgEBIIADAA4AAADjBwkAEwAHAC0AHAAEAFoBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEsAAABbUEFUQ0hdIEJhc2VUb29sczoiLS1leGNsdWRlIiBkb24ndCBh cHBseSBpZiBwYXJhbWV0ZXIgZW5kcyB3aXRoIHNlcGFyYXRvcgA/GgELgAEAIQAAADYzMEU0MzQ0 MTc5RUU1NDBCMTBFMDQ1MkI5NjYzQUZBAAYHAQOQBgDMDQAAMwAAAAIBfwABAAAASAAAADxGQUQw RDdFMEFFMEZBNTREOTg3RjZFNzI0MzVDQUZENTBBRkJEQzA4QFNIU01TWDEwMS5jY3IuY29ycC5p bnRlbC5jb20+AAsAHw4BAAAAAgEJEAEAAADwAwAA7AMAALMGAABMWkZ1MmPSTWEACmZiaWQEAABj Y8BwZzEyNTIA/gND8HRleHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjI OwliMTkOwL8JwxZyCjIWcQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2 AhByAMB0fQhQbhoxECAFwAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJr bWsGcwGQACAgQk1fQuBFR0lOfQr8AfEL8gpsC4BlCoBCWjpoAQJAcHM6Ly9idUxnegMQC2AudAcw bhJvBaFlLgWwZy9zEGhvd18isS5jZ5RpPw3QPRZwNDQhldUhlUYa80QZEEYDEAeQoC5weSBJAjBl CVA6XBoEUwMQDlACIFBr0GcgLS0QMGMKQAEAkCBMaWIYcHJ5J7H5B3BSZSTAH2AEkA4AJ7DZJXtJ dAQgCrFhB4AboqYiKY8qlCIgCfBkBCDhA/B0aCAnJ7Au8CGk2yKwBUBJG9AAcCcFQBIA8mUcsW8g GDAFQC6wMKJvKQYuwBnhKikgDeAJcGNnGJEtICV7VGgEACwBdOcRwDEQBCBnbwuAKMAwsfhmaXgx 8TShBAEKUCVsKENjOilxbTWCR2FNMMA8IaA4Ei5nOHBALwuAJ4EkoANwPjdJQm9YYiBGCfAowDwG 4GI5JKAuZjsBOV8UwGlnCRhQZC0ZMGYtYnmFN9BaNJBqdS5GA5F0PHo+Eng7oABwO/8KLSjgLSGV H7BhEgBUb3EG8HMvUwUDQaAmTyDgfCAxICtApkOANfDnHnAb0BmjZCxDcQuAEgDFACBpAiAoKykl bA3gzwEgKNEkwAVAYS9BL0I//SdAYke/SM8nMCGVHbEQMEAgMzE1MGIBEDMwYzIuLhdwFnAzM+40 AQAcYB6RNiVHQHFHn3tLD0wZK1JgSf9Qr0wZQMJAKNA1Myw2Q5BVofw3IFVhAQE64BrzJtMnYKpE MyAoV5FQGIBoRRA9GXB0LMAfYEUQBxBnc1wpOkCmWcom0k4sQXOAWzpdID0gW0cgvxrhHHBFQVqI MRBbkSAjcLcxAQOgWPIuGXEpMl1ZX/dZwRtBI0BuClBbUT5gUzD/NsZZy1uyWAJdbllGUoBkDbdi M1tgWAIuH2AFESgu8fUvASllti9mcGC/WcVc4b9dMhkQJyBlggQAMxEoWAL+KU+QHcBo7URSagRZ T2RP61tgaTZqNXEoXfVXkUUQ/2oTbE9oWGk/akVlcy5SLqKfV8ZsJ09xIZVNsDE0dhD+LgPwHcAk QCcQAFAlexVCAXggHwBCAAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwBlAAEAAAAq AAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAGQAAQAAAAoA AABTAE0AVABQAAAAAAACAUEAAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAs ACAAWgBoAGkAagB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUA bAAuAGMAbwBtAAAAHwACXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAu AGMAbwBtAAAAAAAfAOVfAQAAADIAAABzAGkAcAA6AHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4A dABlAGwALgBjAG8AbQAAAAAAHwAaDAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwAf DAEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAB4M AQAAAAoAAABTAE0AVABQAAAAAAACARkMAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBG AGEAbgAsACAAWgBoAGkAagB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkA bgB0AGUAbAAuAGMAbwBtAAAAHwABXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0 AGUAbAAuAGMAbwBtAAAAAAAfAPg/AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfACNA AQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AIkAB AAAACgAAAFMATQBUAFAAAAAAAAIB+T8BAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYA YQBuACwAIABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBu AHQAZQBsAC4AYwBvAG0AAAAfAAldAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQA ZQBsAC4AYwBvAG0AAAAAAAsAQDoBAAAAHwAaAAEAAAASAAAASQBQAE0ALgBOAG8AdABlAAAAAAAD APE/CQQAAAsAQDoBAAAAAwD9P+QEAAACAQswAQAAABAAAABjDkNEF57lQLEOBFK5Zjr6AwAXAAEA AABAADkAAJxxNL5u1QFAAAgwerHgNL5u1QEfAACAhgMCAAAAAADAAAAAAAAARgEAAAAeAAAAYQBj AGMAZQBwAHQAbABhAG4AZwB1AGEAZwBlAAAAAAABAAAADAAAAGUAbgAtAFUAUwAAAB8ANwABAAAA lgAAAFsAUABBAFQAQwBIAF0AIABCAGEAcwBlAFQAbwBvAGwAcwA6ACIALQAtAGUAeABjAGwAdQBk AGUAIgAgAGQAbwBuACcAdAAgAGEAcABwAGwAeQAgAGkAZgAgAHAAYQByAGEAbQBlAHQAZQByACAA ZQBuAGQAcwAgAHcAaQB0AGgAIABzAGUAcABhAHIAYQB0AG8AcgAAAAAAHwA9AAEAAAACAAAAAAAA AAMANgAAAAAAAgFxAAEAAAAWAAAAAdVuvjPs0FPAGle2SrC/1eeX3X4cAAAAHwBwAAEAAACWAAAA WwBQAEEAVABDAEgAXQAgAEIAYQBzAGUAVABvAG8AbABzADoAIgAtAC0AZQB4AGMAbAB1AGQAZQAi ACAAZABvAG4AJwB0ACAAYQBwAHAAbAB5ACAAaQBmACAAcABhAHIAYQBtAGUAdABlAHIAIABlAG4A ZABzACAAdwBpAHQAaAAgAHMAZQBwAGEAcgBhAHQAbwByAAAAAAAfADUQAQAAAJAAAAA8AEYAQQBE ADAARAA3AEUAMABBAEUAMABGAEEANQA0AEQAOQA4ADcARgA2AEUANwAyADQAMwA1AEMAQQBGAEQA NQAwAEEARgBCAEQAQwAwADgAQABTAEgAUwBNAFMAWAAxADAAMQAuAGMAYwByAC4AYwBvAHIAcAAu AGkAbgB0AGUAbAAuAGMAbwBtAD4AAAADAN4/n04AAEAABzC27ts0vm7VAQIBCwABAAAAEAAAAGMO Q0QXnuVAsQ4EUrlmOvoDACYAAAAAAAIBRwABAAAAMwAAAGM9VVM7YT1NQ0k7cD1JbnRlbDtsPVNI U01TWDEwMS0xOTA5MTkwNzQ1MjhaLTE0ODI5AAACARAwAQAAAEYAAAAAAAAAJne9OTvsOEmkphU9 y6V7QgcA+tDX4K4PpU2Yf25yQ1yv1QAAAEQRXgAAppNoNoh2bEunStPrR5pMZAAACVTAEAAAAAAf APo/AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAADAAlZAQAAAEAAAIAIIAYAAAAAAMAA AAAAAABGAAAAAL+FAADg6O8zvm7VAQsAAIAIIAYAAAAAAMAAAAAAAABGAAAAAIKFAAAAAAAAHwAA gIYDAgAAAAAAwAAAAAAAAEYBAAAAGAAAAGQAbABwAC0AcAByAG8AZAB1AGMAdAAAAAEAAAAaAAAA ZABsAHAAZQAtAHcAaQBuAGQAbwB3AHMAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABk AGwAcAAtAHYAZQByAHMAaQBvAG4AAAABAAAAEgAAADEAMQAuADIALgAwAC4ANgAAAAAAHwAAgIYD AgAAAAAAwAAAAAAAAEYBAAAAGgAAAGQAbABwAC0AcgBlAGEAYwB0AGkAbwBuAAAAAAABAAAAFAAA AG4AbwAtAGEAYwB0AGkAbwBuAAAAAwANNP0/AAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAgAAAA eAAtAG0AcwAtAGgAYQBzAC0AYQB0AHQAYQBjAGgAAAABAAAAAgAAAAAAAAAfAACAhgMCAAAAAADA AAAAAAAARgEAAAAiAAAAeAAtAG8AcgBpAGcAaQBuAGEAdABpAG4AZwAtAGkAcAAAAAAAAQAAACAA AABbADEAMAAuADIAMwA5AC4AMQAyADcALgA0ADAAXQAAAF7Y --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBDC08SHSMSX101ccrcor_--