Fix issue where code in utility routine to_String_for_subst() had code whose result...

diff --git a/.gitignore b/.gitignore
index a5ff57167d357e90bd8a2820186c5d19e110688c..67d4e35bd42f6c9d77792a99c7bad86756c298e1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,8 @@ venv.bak/
 
 # SCons files
 .sconsign.*
+
+# Tool output
+.coverage
+htmlcov
+

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0e742ec5ee26d81ab6afd05b065543d08fc7e9ae..1b0b0f804269f365338dd113edc9ecd99fcd626e 100644 (file)
--- 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 f47839911fee856bd14dd9736ac86e4bfb98a19e..11bcf2ede1d6a0733a8916533b442ac52a8f80a4 100644 (file)
--- 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.