BaseTools: Remove equality operator with None
replace "== None" with "is None" and "!= None" with "is not None" Cc: Yonghong Zhu <yonghong.zhu@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
committed by
Yonghong Zhu
parent
05a32984ab
commit
4231a8193e
@@ -722,7 +722,7 @@ def ReadMessage(From, To, ExitFlag):
|
||||
# read one line a time
|
||||
Line = From.readline()
|
||||
# empty string means "end"
|
||||
if Line != None and Line != "":
|
||||
if Line is not None and Line != "":
|
||||
To(Line.rstrip())
|
||||
else:
|
||||
break
|
||||
@@ -904,7 +904,7 @@ class PcdReport(object):
|
||||
elif ReportSubType == 2:
|
||||
PcdDict = self.UnusedPcds
|
||||
|
||||
if ModulePcdSet == None:
|
||||
if ModulePcdSet is None:
|
||||
FileWrite(File, gSectionStart)
|
||||
if ReportSubType == 1:
|
||||
FileWrite(File, "Conditional Directives used by the build system")
|
||||
@@ -966,7 +966,7 @@ class PcdReport(object):
|
||||
PcdValue = DecDefaultValue
|
||||
if DscDefaultValue:
|
||||
PcdValue = DscDefaultValue
|
||||
if ModulePcdSet != None:
|
||||
if ModulePcdSet is not None:
|
||||
if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Type) not in ModulePcdSet:
|
||||
continue
|
||||
InfDefault, PcdValue = ModulePcdSet[Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Type]
|
||||
@@ -985,7 +985,7 @@ class PcdReport(object):
|
||||
break
|
||||
|
||||
if First:
|
||||
if ModulePcdSet == None:
|
||||
if ModulePcdSet is None:
|
||||
FileWrite(File, "")
|
||||
FileWrite(File, Key)
|
||||
First = False
|
||||
@@ -993,35 +993,35 @@ class PcdReport(object):
|
||||
|
||||
if Pcd.DatumType in ('UINT8', 'UINT16', 'UINT32', 'UINT64'):
|
||||
PcdValueNumber = int(PcdValue.strip(), 0)
|
||||
if DecDefaultValue == None:
|
||||
if DecDefaultValue is None:
|
||||
DecMatch = True
|
||||
else:
|
||||
DecDefaultValueNumber = int(DecDefaultValue.strip(), 0)
|
||||
DecMatch = (DecDefaultValueNumber == PcdValueNumber)
|
||||
|
||||
if InfDefaultValue == None:
|
||||
if InfDefaultValue is None:
|
||||
InfMatch = True
|
||||
else:
|
||||
InfDefaultValueNumber = int(InfDefaultValue.strip(), 0)
|
||||
InfMatch = (InfDefaultValueNumber == PcdValueNumber)
|
||||
|
||||
if DscDefaultValue == None:
|
||||
if DscDefaultValue is None:
|
||||
DscMatch = True
|
||||
else:
|
||||
DscDefaultValueNumber = int(DscDefaultValue.strip(), 0)
|
||||
DscMatch = (DscDefaultValueNumber == PcdValueNumber)
|
||||
else:
|
||||
if DecDefaultValue == None:
|
||||
if DecDefaultValue is None:
|
||||
DecMatch = True
|
||||
else:
|
||||
DecMatch = (DecDefaultValue.strip() == PcdValue.strip())
|
||||
|
||||
if InfDefaultValue == None:
|
||||
if InfDefaultValue is None:
|
||||
InfMatch = True
|
||||
else:
|
||||
InfMatch = (InfDefaultValue.strip() == PcdValue.strip())
|
||||
|
||||
if DscDefaultValue == None:
|
||||
if DscDefaultValue is None:
|
||||
DscMatch = True
|
||||
else:
|
||||
DscMatch = (DscDefaultValue.strip() == PcdValue.strip())
|
||||
@@ -1087,7 +1087,7 @@ class PcdReport(object):
|
||||
else:
|
||||
self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*M')
|
||||
|
||||
if ModulePcdSet == None:
|
||||
if ModulePcdSet is None:
|
||||
if IsStructure:
|
||||
continue
|
||||
if not TypeName in ('PATCH', 'FLAG', 'FIXED'):
|
||||
@@ -1111,7 +1111,7 @@ class PcdReport(object):
|
||||
else:
|
||||
FileWrite(File, ' *M %-*s = %s' % (self.MaxLen + 19, ModulePath, ModuleDefault.strip()))
|
||||
|
||||
if ModulePcdSet == None:
|
||||
if ModulePcdSet is None:
|
||||
FileWrite(File, gSectionEnd)
|
||||
else:
|
||||
if not ReportSubType and ModulePcdSet:
|
||||
@@ -1127,7 +1127,7 @@ class PcdReport(object):
|
||||
return HasDscOverride
|
||||
|
||||
def PrintPcdDefault(self, File, Pcd, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue):
|
||||
if not DscMatch and DscDefaultValue != None:
|
||||
if not DscMatch and DscDefaultValue is not None:
|
||||
Value = DscDefaultValue.strip()
|
||||
IsByteArray, ArrayList = ByteArrayForamt(Value)
|
||||
if IsByteArray:
|
||||
@@ -1136,7 +1136,7 @@ class PcdReport(object):
|
||||
FileWrite(File, '%s' % (Array))
|
||||
else:
|
||||
FileWrite(File, ' %*s = %s' % (self.MaxLen + 19, 'DSC DEFAULT', Value))
|
||||
if not InfMatch and InfDefaultValue != None:
|
||||
if not InfMatch and InfDefaultValue is not None:
|
||||
Value = InfDefaultValue.strip()
|
||||
IsByteArray, ArrayList = ByteArrayForamt(Value)
|
||||
if IsByteArray:
|
||||
@@ -1146,7 +1146,7 @@ class PcdReport(object):
|
||||
else:
|
||||
FileWrite(File, ' %*s = %s' % (self.MaxLen + 19, 'INF DEFAULT', Value))
|
||||
|
||||
if not DecMatch and DecDefaultValue != None:
|
||||
if not DecMatch and DecDefaultValue is not None:
|
||||
Value = DecDefaultValue.strip()
|
||||
IsByteArray, ArrayList = ByteArrayForamt(Value)
|
||||
if IsByteArray:
|
||||
@@ -1971,7 +1971,7 @@ class PlatformReport(object):
|
||||
self.PcdReport = PcdReport(Wa)
|
||||
|
||||
self.FdReportList = []
|
||||
if "FLASH" in ReportType and Wa.FdfProfile and MaList == None:
|
||||
if "FLASH" in ReportType and Wa.FdfProfile and MaList is None:
|
||||
for Fd in Wa.FdfProfile.FdDict:
|
||||
self.FdReportList.append(FdReport(Wa.FdfProfile.FdDict[Fd], Wa))
|
||||
|
||||
@@ -1984,7 +1984,7 @@ class PlatformReport(object):
|
||||
self.DepexParser = DepexParser(Wa)
|
||||
|
||||
self.ModuleReportList = []
|
||||
if MaList != None:
|
||||
if MaList is not None:
|
||||
self._IsModuleBuild = True
|
||||
for Ma in MaList:
|
||||
self.ModuleReportList.append(ModuleReport(Ma, ReportType))
|
||||
@@ -1994,13 +1994,13 @@ class PlatformReport(object):
|
||||
ModuleAutoGenList = []
|
||||
for ModuleKey in Pa.Platform.Modules:
|
||||
ModuleAutoGenList.append(Pa.Platform.Modules[ModuleKey].M)
|
||||
if GlobalData.gFdfParser != None:
|
||||
if GlobalData.gFdfParser is not None:
|
||||
if Pa.Arch in GlobalData.gFdfParser.Profile.InfDict:
|
||||
INFList = GlobalData.gFdfParser.Profile.InfDict[Pa.Arch]
|
||||
for InfName in INFList:
|
||||
InfClass = PathClass(NormPath(InfName), Wa.WorkspaceDir, Pa.Arch)
|
||||
Ma = ModuleAutoGen(Wa, InfClass, Pa.BuildTarget, Pa.ToolChain, Pa.Arch, Wa.MetaFile)
|
||||
if Ma == None:
|
||||
if Ma is None:
|
||||
continue
|
||||
if Ma not in ModuleAutoGenList:
|
||||
ModuleAutoGenList.append(Ma)
|
||||
|
@@ -241,7 +241,7 @@ def ReadMessage(From, To, ExitFlag):
|
||||
# read one line a time
|
||||
Line = From.readline()
|
||||
# empty string means "end"
|
||||
if Line != None and Line != "":
|
||||
if Line is not None and Line != "":
|
||||
To(Line.rstrip())
|
||||
else:
|
||||
break
|
||||
@@ -299,9 +299,9 @@ def LaunchCommand(Command, WorkingDir):
|
||||
except: # in case of aborting
|
||||
# terminate the threads redirecting the program output
|
||||
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())
|
||||
if EndOfProcedure != None:
|
||||
if EndOfProcedure is not None:
|
||||
EndOfProcedure.set()
|
||||
if Proc == None:
|
||||
if Proc is None:
|
||||
if type(Command) != type(""):
|
||||
Command = " ".join(Command)
|
||||
EdkLogger.error("build", COMMAND_FAILURE, "Failed to start command", ExtraData="%s [%s]" % (Command, WorkingDir))
|
||||
@@ -375,7 +375,7 @@ class BuildUnit:
|
||||
# @param Other The other BuildUnit object compared to
|
||||
#
|
||||
def __eq__(self, Other):
|
||||
return Other != None and self.BuildObject == Other.BuildObject \
|
||||
return Other is not None and self.BuildObject == Other.BuildObject \
|
||||
and self.BuildObject.Arch == Other.BuildObject.Arch
|
||||
|
||||
## hash() method
|
||||
@@ -633,7 +633,7 @@ class BuildTask:
|
||||
self.BuildItem = BuildItem
|
||||
|
||||
self.DependencyList = []
|
||||
if Dependency == None:
|
||||
if Dependency is None:
|
||||
Dependency = BuildItem.Dependency
|
||||
else:
|
||||
Dependency.extend(BuildItem.Dependency)
|
||||
@@ -795,7 +795,7 @@ class Build():
|
||||
BinCacheSource = mws.join(self.WorkspaceDir, BinCacheSource)
|
||||
GlobalData.gBinCacheSource = BinCacheSource
|
||||
else:
|
||||
if GlobalData.gBinCacheSource != None:
|
||||
if GlobalData.gBinCacheSource is not None:
|
||||
EdkLogger.error("build", OPTION_VALUE_INVALID, ExtraData="Invalid value of option --binary-source.")
|
||||
|
||||
if GlobalData.gBinCacheDest:
|
||||
@@ -804,7 +804,7 @@ class Build():
|
||||
BinCacheDest = mws.join(self.WorkspaceDir, BinCacheDest)
|
||||
GlobalData.gBinCacheDest = BinCacheDest
|
||||
else:
|
||||
if GlobalData.gBinCacheDest != None:
|
||||
if GlobalData.gBinCacheDest is not None:
|
||||
EdkLogger.error("build", OPTION_VALUE_INVALID, ExtraData="Invalid value of option --binary-destination.")
|
||||
|
||||
if self.ConfDirectory:
|
||||
@@ -907,7 +907,7 @@ class Build():
|
||||
# if no tool chain given in command line, get it from target.txt
|
||||
if not self.ToolChainList:
|
||||
self.ToolChainList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_TAG]
|
||||
if self.ToolChainList == None or len(self.ToolChainList) == 0:
|
||||
if self.ToolChainList is None or len(self.ToolChainList) == 0:
|
||||
EdkLogger.error("build", RESOURCE_NOT_AVAILABLE, ExtraData="No toolchain given. Don't know how to build.\n")
|
||||
|
||||
# check if the tool chains are defined or not
|
||||
@@ -935,7 +935,7 @@ class Build():
|
||||
ToolChainFamily.append(ToolDefinition[TAB_TOD_DEFINES_FAMILY][Tool])
|
||||
self.ToolChainFamily = ToolChainFamily
|
||||
|
||||
if self.ThreadNumber == None:
|
||||
if self.ThreadNumber is None:
|
||||
self.ThreadNumber = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER]
|
||||
if self.ThreadNumber == '':
|
||||
self.ThreadNumber = 0
|
||||
@@ -1224,7 +1224,7 @@ class Build():
|
||||
# for dependent modules/Libraries
|
||||
#
|
||||
def _BuildPa(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False, FfsCommand={}):
|
||||
if AutoGenObject == None:
|
||||
if AutoGenObject is None:
|
||||
return False
|
||||
|
||||
# skip file generation for cleanxxx targets, run and fds target
|
||||
@@ -1252,7 +1252,7 @@ class Build():
|
||||
EdkLogger.quiet("Building ... %s" % repr(AutoGenObject))
|
||||
|
||||
BuildCommand = AutoGenObject.BuildCommand
|
||||
if BuildCommand == None or len(BuildCommand) == 0:
|
||||
if BuildCommand is None or len(BuildCommand) == 0:
|
||||
EdkLogger.error("build", OPTION_MISSING,
|
||||
"No build command found for this module. "
|
||||
"Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." %
|
||||
@@ -1343,7 +1343,7 @@ class Build():
|
||||
# for dependent modules/Libraries
|
||||
#
|
||||
def _Build(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False):
|
||||
if AutoGenObject == None:
|
||||
if AutoGenObject is None:
|
||||
return False
|
||||
|
||||
# skip file generation for cleanxxx targets, run and fds target
|
||||
@@ -1372,7 +1372,7 @@ class Build():
|
||||
EdkLogger.quiet("Building ... %s" % repr(AutoGenObject))
|
||||
|
||||
BuildCommand = AutoGenObject.BuildCommand
|
||||
if BuildCommand == None or len(BuildCommand) == 0:
|
||||
if BuildCommand is None or len(BuildCommand) == 0:
|
||||
EdkLogger.error("build", OPTION_MISSING,
|
||||
"No build command found for this module. "
|
||||
"Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." %
|
||||
@@ -1536,7 +1536,7 @@ class Build():
|
||||
FvMap.readline()
|
||||
for Line in FvMap:
|
||||
MatchGuid = GuidPattern.match(Line)
|
||||
if MatchGuid != None:
|
||||
if MatchGuid is not None:
|
||||
#
|
||||
# Replace GUID with module name
|
||||
#
|
||||
@@ -1548,7 +1548,7 @@ class Build():
|
||||
# Add the debug image full path.
|
||||
#
|
||||
MatchGuid = GuidName.match(Line)
|
||||
if MatchGuid != None:
|
||||
if MatchGuid is not None:
|
||||
GuidString = MatchGuid.group().split("=")[1]
|
||||
if GuidString.upper() in ModuleList:
|
||||
MapBuffer.write('(IMAGE=%s)\n' % (os.path.join(ModuleList[GuidString.upper()].DebugDir, ModuleList[GuidString.upper()].Name + '.efi')))
|
||||
@@ -1758,7 +1758,7 @@ class Build():
|
||||
for Module in Pa.Platform.Modules:
|
||||
# Get ModuleAutoGen object to generate C code file and makefile
|
||||
Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)
|
||||
if Ma == None:
|
||||
if Ma is None:
|
||||
continue
|
||||
self.BuildModules.append(Ma)
|
||||
self._BuildPa(self.Target, Pa, FfsCommand=CmdListDict)
|
||||
@@ -1778,7 +1778,7 @@ class Build():
|
||||
ModuleList = {}
|
||||
for Pa in Wa.AutoGenObjectList:
|
||||
for Ma in Pa.ModuleAutoGenList:
|
||||
if Ma == None:
|
||||
if Ma is None:
|
||||
continue
|
||||
if not Ma.IsLibrary:
|
||||
ModuleList[Ma.Guid.upper()] = Ma
|
||||
@@ -1856,7 +1856,7 @@ class Build():
|
||||
for Module in Pa.Platform.Modules:
|
||||
if self.ModuleFile.Dir == Module.Dir and self.ModuleFile.Name == Module.Name:
|
||||
Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)
|
||||
if Ma == None: continue
|
||||
if Ma is None: continue
|
||||
MaList.append(Ma)
|
||||
if Ma.CanSkipbyHash():
|
||||
self.HashSkipModules.append(Ma)
|
||||
@@ -1936,7 +1936,7 @@ class Build():
|
||||
ModuleList = {}
|
||||
for Pa in Wa.AutoGenObjectList:
|
||||
for Ma in Pa.ModuleAutoGenList:
|
||||
if Ma == None:
|
||||
if Ma is None:
|
||||
continue
|
||||
if not Ma.IsLibrary:
|
||||
ModuleList[Ma.Guid.upper()] = Ma
|
||||
@@ -2021,13 +2021,13 @@ class Build():
|
||||
AutoGenStart = time.time()
|
||||
GlobalData.gGlobalDefines['ARCH'] = Arch
|
||||
Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)
|
||||
if Pa == None:
|
||||
if Pa is None:
|
||||
continue
|
||||
ModuleList = []
|
||||
for Inf in Pa.Platform.Modules:
|
||||
ModuleList.append(Inf)
|
||||
# Add the INF only list in FDF
|
||||
if GlobalData.gFdfParser != None:
|
||||
if GlobalData.gFdfParser is not None:
|
||||
for InfName in GlobalData.gFdfParser.Profile.InfList:
|
||||
Inf = PathClass(NormPath(InfName), self.WorkspaceDir, Arch)
|
||||
if Inf in Pa.Platform.Modules:
|
||||
@@ -2037,7 +2037,7 @@ class Build():
|
||||
# Get ModuleAutoGen object to generate C code file and makefile
|
||||
Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)
|
||||
|
||||
if Ma == None:
|
||||
if Ma is None:
|
||||
continue
|
||||
if Ma.CanSkipbyHash():
|
||||
self.HashSkipModules.append(Ma)
|
||||
@@ -2122,7 +2122,7 @@ class Build():
|
||||
ModuleList = {}
|
||||
for Pa in Wa.AutoGenObjectList:
|
||||
for Ma in Pa.ModuleAutoGenList:
|
||||
if Ma == None:
|
||||
if Ma is None:
|
||||
continue
|
||||
if not Ma.IsLibrary:
|
||||
ModuleList[Ma.Guid.upper()] = Ma
|
||||
@@ -2263,18 +2263,18 @@ class Build():
|
||||
FilePath = os.path.join(os.path.dirname(GlobalData.gDatabasePath), "gFileTimeStampCache")
|
||||
if Utils.gFileTimeStampCache == {} and os.path.isfile(FilePath):
|
||||
Utils.gFileTimeStampCache = Utils.DataRestore(FilePath)
|
||||
if Utils.gFileTimeStampCache == None:
|
||||
if Utils.gFileTimeStampCache is None:
|
||||
Utils.gFileTimeStampCache = {}
|
||||
|
||||
FilePath = os.path.join(os.path.dirname(GlobalData.gDatabasePath), "gDependencyDatabase")
|
||||
if Utils.gDependencyDatabase == {} and os.path.isfile(FilePath):
|
||||
Utils.gDependencyDatabase = Utils.DataRestore(FilePath)
|
||||
if Utils.gDependencyDatabase == None:
|
||||
if Utils.gDependencyDatabase is None:
|
||||
Utils.gDependencyDatabase = {}
|
||||
|
||||
def ParseDefines(DefineList=[]):
|
||||
DefineDict = {}
|
||||
if DefineList != None:
|
||||
if DefineList is not None:
|
||||
for Define in DefineList:
|
||||
DefineTokenList = Define.split("=", 1)
|
||||
if not GlobalData.gMacroNamePattern.match(DefineTokenList[0]):
|
||||
@@ -2403,16 +2403,16 @@ def Main():
|
||||
GlobalData.gCaseInsensitive = Option.CaseInsensitive
|
||||
|
||||
# Set log level
|
||||
if Option.verbose != None:
|
||||
if Option.verbose is not None:
|
||||
EdkLogger.SetLevel(EdkLogger.VERBOSE)
|
||||
elif Option.quiet != None:
|
||||
elif Option.quiet is not None:
|
||||
EdkLogger.SetLevel(EdkLogger.QUIET)
|
||||
elif Option.debug != None:
|
||||
elif Option.debug is not None:
|
||||
EdkLogger.SetLevel(Option.debug + 1)
|
||||
else:
|
||||
EdkLogger.SetLevel(EdkLogger.INFO)
|
||||
|
||||
if Option.LogFile != None:
|
||||
if Option.LogFile is not None:
|
||||
EdkLogger.SetLogFile(Option.LogFile)
|
||||
|
||||
if Option.WarningAsError == True:
|
||||
@@ -2472,13 +2472,13 @@ def Main():
|
||||
if ErrorCode != 0:
|
||||
EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)
|
||||
|
||||
if Option.PlatformFile != None:
|
||||
if Option.PlatformFile is not None:
|
||||
if os.path.isabs (Option.PlatformFile):
|
||||
if os.path.normcase (os.path.normpath(Option.PlatformFile)).find (Workspace) == 0:
|
||||
Option.PlatformFile = NormFile(os.path.normpath(Option.PlatformFile), Workspace)
|
||||
Option.PlatformFile = PathClass(Option.PlatformFile, Workspace)
|
||||
|
||||
if Option.FdfFile != None:
|
||||
if Option.FdfFile is not None:
|
||||
if os.path.isabs (Option.FdfFile):
|
||||
if os.path.normcase (os.path.normpath(Option.FdfFile)).find (Workspace) == 0:
|
||||
Option.FdfFile = NormFile(os.path.normpath(Option.FdfFile), Workspace)
|
||||
@@ -2487,7 +2487,7 @@ def Main():
|
||||
if ErrorCode != 0:
|
||||
EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)
|
||||
|
||||
if Option.Flag != None and Option.Flag not in ['-c', '-s']:
|
||||
if Option.Flag is not None and Option.Flag not in ['-c', '-s']:
|
||||
EdkLogger.error("build", OPTION_VALUE_INVALID, "UNI flag must be one of -c or -s")
|
||||
|
||||
MyBuild = Build(Target, Workspace, Option)
|
||||
@@ -2504,35 +2504,35 @@ def Main():
|
||||
#
|
||||
BuildError = False
|
||||
except FatalError, X:
|
||||
if MyBuild != None:
|
||||
if MyBuild is not None:
|
||||
# for multi-thread build exits safely
|
||||
MyBuild.Relinquish()
|
||||
if Option != None and Option.debug != None:
|
||||
if Option is not None and Option.debug is not None:
|
||||
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())
|
||||
ReturnCode = X.args[0]
|
||||
except Warning, X:
|
||||
# error from Fdf parser
|
||||
if MyBuild != None:
|
||||
if MyBuild is not None:
|
||||
# for multi-thread build exits safely
|
||||
MyBuild.Relinquish()
|
||||
if Option != None and Option.debug != None:
|
||||
if Option is not None and Option.debug is not None:
|
||||
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())
|
||||
else:
|
||||
EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError=False)
|
||||
ReturnCode = FORMAT_INVALID
|
||||
except KeyboardInterrupt:
|
||||
ReturnCode = ABORT_ERROR
|
||||
if Option != None and Option.debug != None:
|
||||
if Option is not None and Option.debug is not None:
|
||||
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())
|
||||
except:
|
||||
if MyBuild != None:
|
||||
if MyBuild is not None:
|
||||
# for multi-thread build exits safely
|
||||
MyBuild.Relinquish()
|
||||
|
||||
# try to get the meta-file from the object causing exception
|
||||
Tb = sys.exc_info()[-1]
|
||||
MetaFile = GlobalData.gProcessingFile
|
||||
while Tb != None:
|
||||
while Tb is not None:
|
||||
if 'self' in Tb.tb_frame.f_locals and hasattr(Tb.tb_frame.f_locals['self'], 'MetaFile'):
|
||||
MetaFile = Tb.tb_frame.f_locals['self'].MetaFile
|
||||
Tb = Tb.tb_next
|
||||
@@ -2566,7 +2566,7 @@ def Main():
|
||||
BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration) + ", %d day(s)" % (BuildDuration.tm_yday - 1)
|
||||
else:
|
||||
BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration)
|
||||
if MyBuild != None:
|
||||
if MyBuild is not None:
|
||||
if not BuildError:
|
||||
MyBuild.BuildReport.GenerateReport(BuildDurationStr, LogBuildTime(MyBuild.AutoGenTime), LogBuildTime(MyBuild.MakeTime), LogBuildTime(MyBuild.GenFdsTime))
|
||||
MyBuild.Db.Close()
|
||||
|
Reference in New Issue
Block a user