diff options
author | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
---|---|---|
committer | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
commit | 07fc59e19636a4fc97a18b2038f3fe1c72a94000 (patch) | |
tree | 79d4a6239d81b2ccb4752d4f5ca25e0a7d3b4d4b /engine/SCons/Errors.py | |
parent | 7f642861f3946d4241cbd668de258293ba92767a (diff) | |
parent | 340d57481935334465037d97c0db1555b70c0eb1 (diff) |
Merge commit 'upstream/2.0.0'
Diffstat (limited to 'engine/SCons/Errors.py')
-rw-r--r-- | engine/SCons/Errors.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engine/SCons/Errors.py b/engine/SCons/Errors.py index 69b389a..542bc47 100644 --- a/engine/SCons/Errors.py +++ b/engine/SCons/Errors.py @@ -28,7 +28,7 @@ and user errors in SCons. """ -__revision__ = "src/engine/SCons/Errors.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Errors.py 5023 2010/06/14 22:05:46 scons" import SCons.Util @@ -133,7 +133,7 @@ class ExplicitExit(Exception): self.node = node self.status = status self.exitstatus = status - apply(Exception.__init__, (self,) + args) + Exception.__init__(self, *args) def convert_to_BuildError(status, exc_info=None): """ @@ -157,9 +157,7 @@ def convert_to_BuildError(status, exc_info=None): status=status, # might be 0, OK here exitstatus=status, # might be 0, OK here exc_info=exc_info) - # TODO(1.5): - #elif isinstance(status, (StopError, UserError)): - elif isinstance(status, StopError) or isinstance(status, UserError): + elif isinstance(status, (StopError, UserError)): buildError = BuildError( errstr=str(status), status=2, |