summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-10-02 17:06:44 (GMT)
committerGitHub <noreply@github.com>2017-10-02 17:06:44 (GMT)
commitb82dc60ff252ae3af346cb4739215a20281e8908 (patch)
tree8611a53f63580b1266f5e77c7dd822dfe97e2901 /src/engine
parentc3892dc18fbfff134b83710100c73e63abd6ed25 (diff)
parent357a954c3647ab51759f487e4c5dd214dfa86140 (diff)
downloadSCons-b82dc60ff252ae3af346cb4739215a20281e8908.zip
SCons-b82dc60ff252ae3af346cb4739215a20281e8908.tar.gz
SCons-b82dc60ff252ae3af346cb4739215a20281e8908.tar.bz2
Merge pull request #6 from bdbaddog/fix_to_String_for_subst
Fix issue where code in utility routine to_String_for_subst() had code where result was dropped
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Util.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index f478399..11bcf2e 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -481,10 +481,7 @@ def to_String_for_subst(s,
if isinstance(s, BaseStringTypes):
return s
elif isinstance(s, SequenceTypes):
- l = []
- for e in s:
- l.append(to_String_for_subst(e))
- return ' '.join( s )
+ return ' '.join([to_String_for_subst(e) for e in s])
elif isinstance(s, UserString):
# s.data can only be either a unicode or a regular
# string. Please see the UserString initializer.