Older Python portability: isinstance() only takes a single class.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3749 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Errors.py b/src/engine/SCons/Errors.py
index e663fb48c7197918117387de3afa89c153eb27ec..0ac20c4faf4f0a542f165d17897d3f05b698a37b 100644 (file)
--- 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,