Failed in applying to current master (
apply log)
BaseTools/Source/Python/AutoGen/AutoGen.py | 34 +++++------
BaseTools/Source/Python/AutoGen/GenC.py | 2 +-
BaseTools/Source/Python/AutoGen/GenMake.py | 24 ++++----
BaseTools/Source/Python/AutoGen/GenVar.py | 2 +-
BaseTools/Source/Python/AutoGen/InfSectionParser.py | 6 +-
BaseTools/Source/Python/BPDG/GenVpd.py | 2 +-
BaseTools/Source/Python/Common/EdkIIWorkspace.py | 5 +-
BaseTools/Source/Python/Common/Expression.py | 4 +-
BaseTools/Source/Python/Common/Misc.py | 4 +-
BaseTools/Source/Python/Common/Parsing.py | 13 ++---
BaseTools/Source/Python/Common/String.py | 2 +-
BaseTools/Source/Python/Common/VpdInfoFile.py | 8 +--
BaseTools/Source/Python/GenFds/Capsule.py | 8 +--
BaseTools/Source/Python/GenFds/CapsuleData.py | 10 ++--
BaseTools/Source/Python/GenFds/Fd.py | 4 +-
BaseTools/Source/Python/GenFds/FdfParser.py | 18 +++---
BaseTools/Source/Python/GenFds/FfsFileStatement.py | 6 +-
BaseTools/Source/Python/GenFds/FfsInfStatement.py | 2 +-
BaseTools/Source/Python/GenFds/Fv.py | 19 +++---
BaseTools/Source/Python/GenFds/GenFds.py | 61 +++++++++-----------
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 4 +-
BaseTools/Source/Python/GenFds/Region.py | 12 ++--
BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py | 6 +-
BaseTools/Source/Python/TargetTool/TargetTool.py | 8 +--
BaseTools/Source/Python/Workspace/DscBuildData.py | 44 +++++++-------
BaseTools/Source/Python/Workspace/InfBuildData.py | 5 +-
BaseTools/Source/Python/Workspace/MetaFileParser.py | 4 +-
BaseTools/Source/Python/Workspace/WorkspaceCommon.py | 6 +-
BaseTools/Source/Python/build/BuildReport.py | 4 +-
BaseTools/Source/Python/build/build.py | 22 ++++---
30 files changed, 163 insertions(+), 186 deletions(-)