[PATCH V2] BaseTools: Fix regression issue by b23414f6540d

[PATCH V2] BaseTools: Fix regression issue by b23414f6540d

[Feng, YunhuaX]

V2: Renaming function DepexExpressionTokenList to  DepexExpressionDict
instead of changing the callers

Fix regression issue by b23414f6540d4f336b6f00b44681911d469f9a04
AttributeError: 'ModuleAutoGen' object has no attribute
'DepexExpressionDict'

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/AutoGen/AutoGen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 3b1ddc74e8..d30a9be6ee 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -2899,11 +2899,11 @@ class ModuleAutoGen(AutoGen):
     ## Merge dependency expression
     #
     #   @retval     list    The token list of the dependency expression after parsed
     #
     @cached_property
-    def DepexExpressionTokenList(self):
+    def DepexExpressionDict(self):
         if self.DxsFile or self.IsLibrary or TAB_DEPENDENCY_EXPRESSION_FILE in self.FileTypes:
             return {}
 
         RetVal = {self.ModuleType:''}
 
-- 
2.12.2.windows.2

Re: [PATCH V2] BaseTools: Fix regression issue by b23414f6540d

[Zhu, Yonghong]

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> 

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Feng, YunhuaX 
Sent: Tuesday, August 21, 2018 8:49 AM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming <liming.gao@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
Subject: [PATCH V2] BaseTools: Fix regression issue by b23414f6540d

V2: Renaming function DepexExpressionTokenList to  DepexExpressionDict instead of changing the callers

Fix regression issue by b23414f6540d4f336b6f00b44681911d469f9a04
AttributeError: 'ModuleAutoGen' object has no attribute 'DepexExpressionDict'

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/AutoGen/AutoGen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 3b1ddc74e8..d30a9be6ee 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -2899,11 +2899,11 @@ class ModuleAutoGen(AutoGen):
     ## Merge dependency expression
     #
     #   @retval     list    The token list of the dependency expression after parsed
     #
     @cached_property
-    def DepexExpressionTokenList(self):
+    def DepexExpressionDict(self):
         if self.DxsFile or self.IsLibrary or TAB_DEPENDENCY_EXPRESSION_FILE in self.FileTypes:
             return {}
 
         RetVal = {self.ModuleType:''}
 
--
2.12.2.windows.2

Re: [PATCH V2] BaseTools: Fix regression issue by b23414f6540d

[Carsey, Jaben]

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: Zhu, Yonghong
> Sent: Monday, August 20, 2018 10:33 PM
> To: Feng, YunhuaX <yunhuax.feng@intel.com>; edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>; Carsey, Jaben
> <jaben.carsey@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>
> Subject: RE: [PATCH V2] BaseTools: Fix regression issue by b23414f6540d
> Importance: High
> 
> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
> 
> Best Regards,
> Zhu Yonghong
> 
> 
> -----Original Message-----
> From: Feng, YunhuaX
> Sent: Tuesday, August 21, 2018 8:49 AM
> To: edk2-devel@lists.01.org
> Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming
> <liming.gao@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> Subject: [PATCH V2] BaseTools: Fix regression issue by b23414f6540d
> 
> V2: Renaming function DepexExpressionTokenList to  DepexExpressionDict
> instead of changing the callers
> 
> Fix regression issue by b23414f6540d4f336b6f00b44681911d469f9a04
> AttributeError: 'ModuleAutoGen' object has no attribute
> 'DepexExpressionDict'
> 
> 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/AutoGen/AutoGen.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
> b/BaseTools/Source/Python/AutoGen/AutoGen.py
> index 3b1ddc74e8..d30a9be6ee 100644
> --- a/BaseTools/Source/Python/AutoGen/AutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
> @@ -2899,11 +2899,11 @@ class ModuleAutoGen(AutoGen):
>      ## Merge dependency expression
>      #
>      #   @retval     list    The token list of the dependency expression after
> parsed
>      #
>      @cached_property
> -    def DepexExpressionTokenList(self):
> +    def DepexExpressionDict(self):
>          if self.DxsFile or self.IsLibrary or TAB_DEPENDENCY_EXPRESSION_FILE in
> self.FileTypes:
>              return {}
> 
>          RetVal = {self.ModuleType:''}
> 
> --
> 2.12.2.windows.2