From: Fan, ZhijuX <zhijux.fan@intel.com>
Date: Thu, 19 Sep 2019 07:45:28 +0000 (+0800)
Subject: BaseTools:"--exclude" don't apply if parameter ends with separator
X-Git-Tag: edk2-stable201911~235
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=6da405ebf6e946429953c56fcbc8f60abe1407de

BaseTools:"--exclude" don't apply if parameter ends with separator

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1944

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 <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---

diff --git a/BaseTools/Scripts/FormatDosFiles.py b/BaseTools/Scripts/FormatDosFiles.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[:] = [f for f in FileNames if f not in Args.Exclude]
             Continue = False
             for Path in Args.Exclude:
+                Path = Path.strip('\\').strip('/')
                 if not os.path.isdir(Path) and not os.path.isfile(Path):
                     Path = os.path.join(ExcludeDir, Path)
                 if os.path.isdir(Path) and Path.endswith(DirPath):