diff options
| author | Steven Knight <knight@baldmt.com> | 2001-12-07 00:29:20 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2001-12-07 00:29:20 (GMT) |
| commit | 9ca1ac7a1f54fafa93713e3ff6bff693ca180d3e (patch) | |
| tree | 7644c76e7330ecea3b6c1a8dfe7bc5b68b1ddd62 /src/engine/SCons/Builder.py | |
| parent | a12957948f90147743ecf2368a9a348c8619a09b (diff) | |
| download | SCons-9ca1ac7a1f54fafa93713e3ff6bff693ca180d3e.zip SCons-9ca1ac7a1f54fafa93713e3ff6bff693ca180d3e.tar.gz SCons-9ca1ac7a1f54fafa93713e3ff6bff693ca180d3e.tar.bz2 | |
Fix problems with Python callable objects as Builder actions, the associated test, and handling errors returned by a builder.
Diffstat (limited to 'src/engine/SCons/Builder.py')
| -rw-r--r-- | src/engine/SCons/Builder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index 2d2d623..983e32f 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -350,7 +350,8 @@ class ActionBase: if type(t) is type(""): t = [t] dict['TARGETS'] = PathList(map(os.path.normpath, t)) - dict['TARGET'] = dict['TARGETS'][0] + if dict['TARGETS']: + dict['TARGET'] = dict['TARGETS'][0] if kw.has_key('source'): s = kw['source'] del kw['source'] @@ -407,8 +408,7 @@ class FunctionAction(ActionBase): # if print_actions: # XXX: WHAT SHOULD WE PRINT HERE? if execute_actions: - dict = apply(self.subst_dict, (), kw) - return apply(self.function, (), dict) + return apply(self.function, (), kw) def get_contents(self, **kw): """Return the signature contents of this callable action. |