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

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

[Fan, ZhijuX]

[-- Attachment #1: Type: text/plain, Size: 1213 bytes --]


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>
---
 BaseTools/Scripts/FormatDosFiles.py | 1 +
 1 file changed, 1 insertion(+)

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):
-- 
2.14.1.windows.1


[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 3855 bytes --]

Re: [PATCH] BaseTools:"--exclude" don't apply if parameter ends with separator

[Liming Gao]

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Fan, ZhijuX <zhijux.fan@intel.com>
> Sent: Thursday, September 19, 2019 3:45 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
> Subject: [PATCH] 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>
> ---
>  BaseTools/Scripts/FormatDosFiles.py | 1 +
>  1 file changed, 1 insertion(+)
> 
> 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):
> --
> 2.14.1.windows.1