diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Util.py | 5 |
3 files changed, 11 insertions, 4 deletions
@@ -35,3 +35,8 @@ venv.bak/ # SCons files .sconsign.* + +# Tool output +.coverage +htmlcov + diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3b717ff..a7ad6f2 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -11,6 +11,11 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Whatever John Doe did. + From William Deegan: + - Fix issue where code in utility routine to_String_for_subst() had code whose result was never + properly returned. + (Found by: James Rinkevich https://pairlist4.pair.net/pipermail/scons-users/2017-October/006358.html ) + From Thomas Berg: - Fixed a regression in scons-3.0.0 where "from __future__ import print_function" was imposed on the scope where SConstruct is executed, breaking existing builds using PY 2.7. 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. |