If the value of a is None, interpolate '', not 'None'.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@104 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 00a833010ae6b1379cb9f38b93e8d611732fbf5b..64930b0a790c721e66f7c8fc1d0483b01dc89362 100644 (file)
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -177,7 +177,11 @@ def scons_subst(string, locals, globals):
         if key[:1] == '{' and key[-1:] == '}':
             key = key[1:-1]
        try:
-           s = str(eval(key, locals, globals))
+            e = eval(key, locals, globals)
+            if e is None:
+                s = ''
+            else:
+                s = str(e)
        except NameError:
            s = ''
        return s

diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py
index 7df0c83b1dab3aa58da22a3403bd776ce0b8f25c..f8829da95d87988d31bff220af5d539bd4e4beae 100644 (file)
--- a/src/engine/SCons/UtilTests.py
+++ b/src/engine/SCons/UtilTests.py
@@ -84,6 +84,7 @@ class UtilTestCase(unittest.TestCase):
         loc['sources'] = PathList(map(os.path.normpath, [ "./foo/blah.cpp",
                                                           "/bar/ack.cpp",
                                                           "../foo/ack.c" ]))
+        loc['xxx'] = None
 
         if os.sep == '/':
             def cvt(str):
@@ -123,6 +124,9 @@ class UtilTestCase(unittest.TestCase):
         newcom = scons_subst("test ${target.dir}", loc, {})
         assert newcom == cvt("test foo")
 
+        newcom = scons_subst("test $xxx", loc, {})
+        assert newcom == cvt("test "), newcom
+
 
 
 if __name__ == "__main__":