diff options
author | Dandan Bi <dandan.bi@intel.com> | 2018-09-05 14:58:07 +0800 |
---|---|---|
committer | Liming Gao <liming.gao@intel.com> | 2018-09-06 13:41:35 +0800 |
commit | 6460513aa66893f486fb6285493a5033a2349df3 (patch) | |
tree | 8e50e516bc2f42bde90cb94238c6ea56ccb96464 /BaseTools/Scripts | |
parent | 4a76d9b9a33783c9a8bd4a77df5427522292586c (diff) | |
download | edk2-6460513aa66893f486fb6285493a5033a2349df3.tar.gz edk2-6460513aa66893f486fb6285493a5033a2349df3.tar.bz2 edk2-6460513aa66893f486fb6285493a5033a2349df3.zip |
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 <liming.gao@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Diffstat (limited to 'BaseTools/Scripts')
-rwxr-xr-x | BaseTools/Scripts/PatchCheck.py | 2 |
1 files changed, 1 insertions, 1 deletions
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.
|