summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-09-15 01:19:55 (GMT)
committerSteven Knight <knight@baldmt.com>2004-09-15 01:19:55 (GMT)
commit7fef06f597626b9ee3faa0aa716819258e583812 (patch)
treec43c6b210684e12eb7c33ddc82ef5325be21feb4 /src/engine/SCons/Script
parentdecb5aded9c3103e52a31cd75fed2391e7bf29c5 (diff)
downloadSCons-7fef06f597626b9ee3faa0aa716819258e583812.zip
SCons-7fef06f597626b9ee3faa0aa716819258e583812.tar.gz
SCons-7fef06f597626b9ee3faa0aa716819258e583812.tar.bz2
Handle exceptions in FunctionActions. (Steve Christensen)
Diffstat (limited to 'src/engine/SCons/Script')
-rw-r--r--src/engine/SCons/Script/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 0ad9102..6ae76bf 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -161,7 +161,10 @@ class BuildTask(SCons.Taskmaster.Task):
t, e = sys.exc_info()[:2]
if t == SCons.Errors.BuildError:
- sys.stderr.write("scons: *** [%s] %s\n" % (e.node, e.errstr))
+ fname = e.node
+ if SCons.Util.is_List(e.node):
+ fname = string.join(map(str, e.node), ', ')
+ sys.stderr.write("scons: *** [%s] %s\n" % (fname, e.errstr))
if e.errstr == 'Exception':
traceback.print_exception(e.args[0], e.args[1], e.args[2])
elif t == SCons.Errors.ExplicitExit: