[PATCH] BaseTools: Fix regression issue by b23414f6540d

[PATCH] BaseTools: Fix regression issue by b23414f6540d

[Feng, YunhuaX]

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

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index deb88a7817..63c040ec07 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -423,11 +423,11 @@ class DepexReport(object):
                 if Match:
                     self.Depex = Match.group(1).strip()
                     self.Source = "DXS"
                     break
         else:
-            self.Depex = M.DepexExpressionDict.get(M.ModuleType, "")
+            self.Depex = M.DepexExpressionTokenList.get(M.ModuleType, "")
             self.ModuleDepex = " ".join(M.Module.DepexExpression[M.Arch, M.ModuleType])
             if not self.ModuleDepex:
                 self.ModuleDepex = "(None)"
 
             LibDepexList = []
-- 
2.12.2.windows.2

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

[Carsey, Jaben]

I think that the error may be the renaming of the original function in my patch that caused this.  Should that function be renamed to DepexExpressionDict instead of changing the callers?  I was not intending to change the external API of the class.

-Jaben

> -----Original Message-----
> From: Feng, YunhuaX
> Sent: Monday, August 20, 2018 1:04 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] BaseTools: Fix regression issue by b23414f6540d
> 
> 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/build/BuildReport.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/build/BuildReport.py
> b/BaseTools/Source/Python/build/BuildReport.py
> index deb88a7817..63c040ec07 100644
> --- a/BaseTools/Source/Python/build/BuildReport.py
> +++ b/BaseTools/Source/Python/build/BuildReport.py
> @@ -423,11 +423,11 @@ class DepexReport(object):
>                  if Match:
>                      self.Depex = Match.group(1).strip()
>                      self.Source = "DXS"
>                      break
>          else:
> -            self.Depex = M.DepexExpressionDict.get(M.ModuleType, "")
> +            self.Depex = M.DepexExpressionTokenList.get(M.ModuleType, "")
>              self.ModuleDepex = " ".join(M.Module.DepexExpression[M.Arch,
> M.ModuleType])
>              if not self.ModuleDepex:
>                  self.ModuleDepex = "(None)"
> 
>              LibDepexList = []
> --
> 2.12.2.windows.2

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

[Feng, YunhuaX]

OK, I will update the patch renaming function DepexExpressionTokenList to DepexExpressionDict instead of changing the callers.

Any question, please let me know. Thanks.

Best Regards
Feng, Yunhua


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

I think that the error may be the renaming of the original function in my patch that caused this.  Should that function be renamed to DepexExpressionDict instead of changing the callers?  I was not intending to change the external API of the class.

-Jaben

> -----Original Message-----
> From: Feng, YunhuaX
> Sent: Monday, August 20, 2018 1:04 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] BaseTools: Fix regression issue by b23414f6540d
> 
> 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/build/BuildReport.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/build/BuildReport.py
> b/BaseTools/Source/Python/build/BuildReport.py
> index deb88a7817..63c040ec07 100644
> --- a/BaseTools/Source/Python/build/BuildReport.py
> +++ b/BaseTools/Source/Python/build/BuildReport.py
> @@ -423,11 +423,11 @@ class DepexReport(object):
>                  if Match:
>                      self.Depex = Match.group(1).strip()
>                      self.Source = "DXS"
>                      break
>          else:
> -            self.Depex = M.DepexExpressionDict.get(M.ModuleType, "")
> +            self.Depex = M.DepexExpressionTokenList.get(M.ModuleType, 
> + "")
>              self.ModuleDepex = " 
> ".join(M.Module.DepexExpression[M.Arch,
> M.ModuleType])
>              if not self.ModuleDepex:
>                  self.ModuleDepex = "(None)"
> 
>              LibDepexList = []
> --
> 2.12.2.windows.2