[PATCH] BaseTools: Fix error leg in DscBuildData.py

[PATCH] BaseTools: Fix error leg in DscBuildData.py

[jake]

Fix a Edk2Logger.warn() message format to match the arguments.

We ran into this after a failure in PcdValueInit.  The failure was
masked by a new exception, "TypeError: not all arguments converted
during string formatting".

Signed-off-by: Jake Garver <jake@nvidia.com>
---
 BaseTools/Source/Python/Workspace/DscBuildData.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 35ec5b37ff..d29b9bf13d 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -3033,7 +3033,7 @@ class DscBuildData(PlatformBuildClassObject):
             returncode, StdOut, StdErr = DscBuildData.ExecuteCommand (Command)
             EdkLogger.verbose ('%s\n%s\n%s' % (Command, StdOut, StdErr))
             if returncode != 0:
-                EdkLogger.warn('Build', COMMAND_FAILURE, 'Can not collect output from command: %s\n%s\n' % (Command, StdOut, StdErr))
+                EdkLogger.warn('Build', COMMAND_FAILURE, 'Can not collect output from command: %s\n%s\n%s\n' % (Command, StdOut, StdErr))
 
         #start update structure pcd final value
         File = open (OutputValueFile, 'r')
-- 
2.17.1

回复: [edk2-devel] [PATCH] BaseTools: Fix error leg in DscBuildData.py

[gaoliming]

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Jake Garver
> via groups.io
> 发送时间: 2022年1月21日 7:58
> 收件人: devel@edk2.groups.io; jbrasen@nvidia.com;
> ashishsingha@nvidia.com
> 抄送: Jake Garver <jake@nvidia.com>
> 主题: [edk2-devel] [PATCH] BaseTools: Fix error leg in DscBuildData.py
> 
> Fix a Edk2Logger.warn() message format to match the arguments.
> 
> We ran into this after a failure in PcdValueInit.  The failure was
> masked by a new exception, "TypeError: not all arguments converted
> during string formatting".
> 
> Signed-off-by: Jake Garver <jake@nvidia.com>
> ---
>  BaseTools/Source/Python/Workspace/DscBuildData.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
> b/BaseTools/Source/Python/Workspace/DscBuildData.py
> index 35ec5b37ff..d29b9bf13d 100644
> --- a/BaseTools/Source/Python/Workspace/DscBuildData.py
> +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
> @@ -3033,7 +3033,7 @@ class DscBuildData(PlatformBuildClassObject):
>              returncode, StdOut, StdErr = DscBuildData.ExecuteCommand
> (Command)
>              EdkLogger.verbose ('%s\n%s\n%s' % (Command, StdOut,
> StdErr))
>              if returncode != 0:
> -                EdkLogger.warn('Build', COMMAND_FAILURE, 'Can not
> collect output from command: %s\n%s\n' % (Command, StdOut, StdErr))
> +                EdkLogger.warn('Build', COMMAND_FAILURE, 'Can not
> collect output from command: %s\n%s\n%s\n' % (Command, StdOut, StdErr))
> 
>          #start update structure pcd final value
>          File = open (OutputValueFile, 'r')
> --
> 2.17.1
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH] BaseTools: Fix error leg in DscBuildData.py

[Jake Garver]

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

Hi folks,

Any interest in accepting this simple fix?

Thanks,
Jake

[-- Attachment #2: Type: text/html, Size: 94 bytes --]

回复: [edk2-devel] [PATCH] BaseTools: Fix error leg in DscBuildData.py

[gaoliming]

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

It has been merged at d4ac53aa91b8a3602166c6adcb9ba8678e0ae969

 

Thanks

Liming

 

发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Jake Garver via groups.io
发送时间: 2022年2月14日 21:10
收件人: Jake Garver <jake@nvidia.com>; devel@edk2.groups.io
主题: Re: [edk2-devel] [PATCH] BaseTools: Fix error leg in DscBuildData.py

 

Hi folks,

Any interest in accepting this simple fix?

Thanks,
Jake 




[-- Attachment #2: Type: text/html, Size: 4071 bytes --]