[edk2-devel] [PATCH] BaseTools: Correct BPDG tool error prints

Konstantin Aladyshev posted 1 patch 1 year, 7 months ago
Failed in applying to current master (apply log)
BaseTools/Source/Python/Common/VpdInfoFile.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[edk2-devel] [PATCH] BaseTools: Correct BPDG tool error prints
Posted by Konstantin Aladyshev 1 year, 7 months ago
Popen communication returns bytestrings. It is necessary to perform
decode on these strings before passing them to the EdkLogger that
works with ordinary strings.

Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
---
 BaseTools/Source/Python/Common/VpdInfoFile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 4249b9f899..1e0c3dfe76 100644
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -248,8 +248,8 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName):
         PopenObject.wait()
 
     if PopenObject.returncode != 0:
-        EdkLogger.debug(EdkLogger.DEBUG_1, "Fail to call BPDG tool", str(error))
+        EdkLogger.debug(EdkLogger.DEBUG_1, "Fail to call BPDG tool", str(error.decode()))
         EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, "Fail to execute BPDG tool with exit code: %d, the error message is: \n %s" % \
-                            (PopenObject.returncode, str(error)))
+                            (PopenObject.returncode, str(error.decode())))
 
     return PopenObject.returncode
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93139): https://edk2.groups.io/g/devel/message/93139
Mute This Topic: https://groups.io/mt/93474930/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] BaseTools: Correct BPDG tool error prints
Posted by Bob Feng 1 year, 7 months ago
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: Konstantin Aladyshev <aladyshev22@gmail.com> 
Sent: Monday, September 5, 2022 5:19 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Konstantin Aladyshev <aladyshev22@gmail.com>
Subject: [PATCH] BaseTools: Correct BPDG tool error prints

Popen communication returns bytestrings. It is necessary to perform decode on these strings before passing them to the EdkLogger that works with ordinary strings.

Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
---
 BaseTools/Source/Python/Common/VpdInfoFile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 4249b9f899..1e0c3dfe76 100644
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -248,8 +248,8 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName):
         PopenObject.wait()      if PopenObject.returncode != 0:-        EdkLogger.debug(EdkLogger.DEBUG_1, "Fail to call BPDG tool", str(error))+        EdkLogger.debug(EdkLogger.DEBUG_1, "Fail to call BPDG tool", str(error.decode()))         EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, "Fail to execute BPDG tool with exit code: %d, the error message is: \n %s" % \-                            (PopenObject.returncode, str(error)))+                            (PopenObject.returncode, str(error.decode())))      return PopenObject.returncode-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#94610): https://edk2.groups.io/g/devel/message/94610
Mute This Topic: https://groups.io/mt/93474930/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] 回复: [PATCH] BaseTools: Correct BPDG tool error prints
Posted by gaoliming via groups.io 1 year, 7 months ago
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: Konstantin Aladyshev <aladyshev22@gmail.com>
> 发送时间: 2022年9月5日 17:19
> 收件人: devel@edk2.groups.io
> 抄送: bob.c.feng@intel.com; gaoliming@byosoft.com.cn;
> yuwei.chen@intel.com; Konstantin Aladyshev <aladyshev22@gmail.com>
> 主题: [PATCH] BaseTools: Correct BPDG tool error prints
> 
> Popen communication returns bytestrings. It is necessary to perform
> decode on these strings before passing them to the EdkLogger that
> works with ordinary strings.
> 
> Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
> ---
>  BaseTools/Source/Python/Common/VpdInfoFile.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py
> b/BaseTools/Source/Python/Common/VpdInfoFile.py
> index 4249b9f899..1e0c3dfe76 100644
> --- a/BaseTools/Source/Python/Common/VpdInfoFile.py
> +++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
> @@ -248,8 +248,8 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName):
>          PopenObject.wait()
> 
> 
> 
>      if PopenObject.returncode != 0:
> 
> -        EdkLogger.debug(EdkLogger.DEBUG_1, "Fail to call BPDG tool",
> str(error))
> 
> +        EdkLogger.debug(EdkLogger.DEBUG_1, "Fail to call BPDG tool",
> str(error.decode()))
> 
>          EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, "Fail
> to execute BPDG tool with exit code: %d, the error message is: \n %s" % \
> 
> -                            (PopenObject.returncode, str(error)))
> 
> +                            (PopenObject.returncode,
> str(error.decode())))
> 
> 
> 
>      return PopenObject.returncode
> 
> --
> 2.25.1





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#94019): https://edk2.groups.io/g/devel/message/94019
Mute This Topic: https://groups.io/mt/93817761/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-