diff options
| author | Feng, Bob C <bob.c.feng@intel.com> | 2019-02-20 23:21:31 +0800 |
|---|---|---|
| committer | Feng, Bob C <bob.c.feng@intel.com> | 2019-02-22 15:47:14 +0800 |
| commit | f747640bf333801062b3b8837e7cfcda75ad6215 (patch) | |
| tree | d1ea915b49b48021fb2af1ef83c51dfeb231a163 /BaseTools/Source/Python/AutoGen/GenMake.py | |
| parent | 4247c24fba94283e74c97103e0b9b67da9b4ea5b (diff) | |
| download | edk2-f747640bf333801062b3b8837e7cfcda75ad6215.tar.gz edk2-f747640bf333801062b3b8837e7cfcda75ad6215.tar.bz2 edk2-f747640bf333801062b3b8837e7cfcda75ad6215.zip | |
BaseTool: Fixed incremental rebuild issue.
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1540
This issue in introduced by commit
d943b0c339fe3d35ffdf9f580ccb7a55915c6854
To convert bytes to string, we need to use bytes.decode()
instead of using str(bytes).
If the source file is not a txt file, ignore that file.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/AutoGen/GenMake.py')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/GenMake.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py index 53c5b8577d..b441817b52 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -1045,14 +1045,14 @@ cleanlib: EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X))
if len(FileContent) == 0:
continue
-
- if FileContent[0] == 0xff or FileContent[0] == 0xfe:
- FileContent = FileContent.decode('utf-16')
- else:
- try:
- FileContent = str(FileContent)
- except:
- pass
+ try:
+ if FileContent[0] == 0xff or FileContent[0] == 0xfe:
+ FileContent = FileContent.decode('utf-16')
+ else:
+ FileContent = FileContent.decode()
+ except:
+ # The file is not txt file. for example .mcb file
+ continue
IncludedFileList = gIncludePattern.findall(FileContent)
for Inc in IncludedFileList:
|