[PATCH 1/1] BaseTools: Roll back code modify by commit 9e47e6f90880

[PATCH 1/1] BaseTools: Roll back code modify by commit 9e47e6f90880

[Feng, YunhuaX]

Roll back code modify by commit 9e47e6f90880,
if ForceRebase not False or True, the GenFv command not need add parameter

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
---
 BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index e867693d7c..ea61f723a7 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -572,13 +572,13 @@ class GenFdsGlobalVariable:
 
         Cmd = ["GenFv"]
         if BaseAddress:
             Cmd += ("-r", BaseAddress)
 
-        if not ForceRebase:
+        if ForceRebase == False:
             Cmd += ("-F", "FALSE")
-        else:
+        elif ForceRebase == True:
             Cmd += ("-F", "TRUE")
 
         if Capsule:
             Cmd.append("-c")
         if Dump:
-- 
2.12.2.windows.2

Re: [PATCH 1/1] BaseTools: Roll back code modify by commit 9e47e6f90880

[Gao, Liming]

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

Because some platform has been broken, I will push this patch soon. 

> -----Original Message-----
> From: Feng, YunhuaX
> Sent: Friday, October 26, 2018 2:08 PM
> To: edk2-devel@lists.01.org
> Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [PATCH 1/1] BaseTools: Roll back code modify by commit 9e47e6f90880
> 
> Roll back code modify by commit 9e47e6f90880,
> if ForceRebase not False or True, the GenFv command not need add parameter
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
> ---
>  BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> index e867693d7c..ea61f723a7 100644
> --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> @@ -572,13 +572,13 @@ class GenFdsGlobalVariable:
> 
>          Cmd = ["GenFv"]
>          if BaseAddress:
>              Cmd += ("-r", BaseAddress)
> 
> -        if not ForceRebase:
> +        if ForceRebase == False:
>              Cmd += ("-F", "FALSE")
> -        else:
> +        elif ForceRebase == True:
>              Cmd += ("-F", "TRUE")
> 
>          if Capsule:
>              Cmd.append("-c")
>          if Dump:
> --
> 2.12.2.windows.2