diff options
author | Fan, ZhijuX <zhijux.fan@intel.com> | 2019-12-02 11:50:48 +0800 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-03-24 02:27:27 +0000 |
commit | 0dee1d1358c95e07637876af1f508f0fd694a809 (patch) | |
tree | 347cc0d2b6a81ffbdcdadd0d08d4077eff80eb88 | |
parent | 0c8ea9fe1adbbee230ee0c68f28b68ca2b0534bc (diff) | |
download | edk2-0dee1d1358c95e07637876af1f508f0fd694a809.tar.gz edk2-0dee1d1358c95e07637876af1f508f0fd694a809.tar.bz2 edk2-0dee1d1358c95e07637876af1f508f0fd694a809.zip |
BaseTools:fix issue for decode the stdout/stderr byte arrays
BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2365
This patch is to fix a build tool regression issue which was introduced
by commit 8ddec24dea74.
compiler output message includes localized string.
So build failed when code decode the stdout/stderr byte arrays.
The cause of the build failed is that Commit 8ddec24dea74
removed "errors='ignore'".
The build tool does not need to deal with localized string,
so we need to add "errors='ignore'".
this function is only invoked for structure PCDs.
Build failed if structurePcd is used in platform dsc file.
The patch is going to fixed this issue
Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-rw-r--r-- | BaseTools/Source/Python/Workspace/DscBuildData.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index 6d32b63cd1..1afbd3eefc 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1769,7 +1769,7 @@ class DscBuildData(PlatformBuildClassObject): except:
EdkLogger.error('Build', COMMAND_FAILURE, 'Can not execute command: %s' % Command)
Result = Process.communicate()
- return Process.returncode, Result[0].decode(), Result[1].decode()
+ return Process.returncode, Result[0].decode(errors='ignore'), Result[1].decode(errors='ignore')
@staticmethod
def IntToCString(Value, ValueSize):
|