Errors.py (SCons-4.3.0) | : | Errors.py (SCons-4.4.0) | ||
---|---|---|---|---|
skipping to change at line 101 | skipping to change at line 101 | |||
self.status = status | self.status = status | |||
self.exitstatus = exitstatus | self.exitstatus = exitstatus | |||
self.filename = filename | self.filename = filename | |||
self.exc_info = exc_info | self.exc_info = exc_info | |||
self.node = node | self.node = node | |||
self.executor = executor | self.executor = executor | |||
self.action = action | self.action = action | |||
self.command = command | self.command = command | |||
Exception.__init__(self, node, errstr, status, exitstatus, filename, | super().__init__(node, errstr, status, exitstatus, filename, | |||
executor, action, command, exc_info) | executor, action, command, exc_info) | |||
def __str__(self): | def __str__(self): | |||
if self.filename: | if self.filename: | |||
return self.filename + ': ' + self.errstr | return self.filename + ': ' + self.errstr | |||
else: | else: | |||
return self.errstr | return self.errstr | |||
class InternalError(Exception): | class InternalError(Exception): | |||
pass | pass | |||
skipping to change at line 130 | skipping to change at line 130 | |||
pass | pass | |||
class MSVCError(IOError): | class MSVCError(IOError): | |||
pass | pass | |||
class ExplicitExit(Exception): | class ExplicitExit(Exception): | |||
def __init__(self, node=None, status=None, *args): | def __init__(self, node=None, status=None, *args): | |||
self.node = node | self.node = node | |||
self.status = status | self.status = status | |||
self.exitstatus = status | self.exitstatus = status | |||
Exception.__init__(self, *args) | super().__init__(*args) | |||
def convert_to_BuildError(status, exc_info=None): | def convert_to_BuildError(status, exc_info=None): | |||
"""Convert a return code to a BuildError Exception. | """Convert a return code to a BuildError Exception. | |||
The `buildError.status` we set here will normally be | The `buildError.status` we set here will normally be | |||
used as the exit status of the "scons" process. | used as the exit status of the "scons" process. | |||
Args: | Args: | |||
status: can either be a return code or an Exception. | status: can either be a return code or an Exception. | |||
exc_info (tuple, optional): explicit exception information. | exc_info (tuple, optional): explicit exception information. | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |