From 6460513aa66893f486fb6285493a5033a2349df3 Mon Sep 17 00:00:00 2001 From: Dandan Bi Date: Wed, 5 Sep 2018 14:58:07 +0800 Subject: [PATCH] BaseTools/PatchCheck.py: Fix error when run with Python3 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1145 Currently run PatchCheck.py with Python3 will meet following error: ..... File "PatchCheck.py", line 554, in run_git return Result[0].decode('utf-8', 'ignore') if Result[0] and Result[0].find("fatal")!=0 else None TypeError: a bytes-like object is required, not 'str' This issue was introduce by commit:5ac4548cdf654. This patch is to convert the str object of "fatal" to byte object to fix this failure. Cc: Liming Gao Cc: Jaben Carsey Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi Reviewed-by: Jaben Carsey --- BaseTools/Scripts/PatchCheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 96b3cdf1fd..0b580f3b31 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -551,7 +551,7 @@ class CheckGitCommits: stdout=subprocess.PIPE, stderr=subprocess.STDOUT) Result = p.communicate() - return Result[0].decode('utf-8', 'ignore') if Result[0] and Result[0].find("fatal")!=0 else None + return Result[0].decode('utf-8', 'ignore') if Result[0] and Result[0].find(b"fatal")!=0 else None class CheckOnePatchFile: """Performs a patch check for a single file. -- 2.39.5