diff options
| author | Steven Knight <knight@baldmt.com> | 2008-10-30 13:05:32 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-10-30 13:05:32 (GMT) |
| commit | a0ec8c213fd9e4d0feff2db943d2cd0c0488ca22 (patch) | |
| tree | d10b55a7bb39d40aa7dbb477ad1f3833992ce538 /src | |
| parent | 6ca143ef9ea732e9104d17f467375a3fa0dfa568 (diff) | |
| download | SCons-a0ec8c213fd9e4d0feff2db943d2cd0c0488ca22.zip SCons-a0ec8c213fd9e4d0feff2db943d2cd0c0488ca22.tar.gz SCons-a0ec8c213fd9e4d0feff2db943d2cd0c0488ca22.tar.bz2 | |
Older Python portability: isinstance() only takes a single class.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Errors.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine/SCons/Errors.py b/src/engine/SCons/Errors.py index e663fb4..0ac20c4 100644 --- a/src/engine/SCons/Errors.py +++ b/src/engine/SCons/Errors.py @@ -154,7 +154,9 @@ 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) - elif isinstance(status, (StopError, UserError)): + # TODO(1.5): + #elif isinstance(status, (StopError, UserError)): + elif isinstance(status, StopError) or isinstance(status, UserError): buildError = BuildError( errstr=str(status), status=2, |