Fix null entries in CPPPATH. (Gary Oberbrunner)

3 files changed, 13 insertions, 1 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 11532e6..32d03c5 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -183,6 +183,9 @@ RELEASE 0.96 - XXX
     file basename.  This supports version numbers as part of shared
     library names, for example.
 
+  - Avoid problems when there are null entries (None or '') in tool
+    lists or CPPPATH.
+
   From Simon Perkins:
 
   - Fix a bug introduced in building shared libraries under MinGW.
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 31d8946..e66a50d 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -1035,7 +1035,7 @@ class FS(LocalFS):
             pathlist = string.split(pathlist, os.pathsep)
         if not SCons.Util.is_List(pathlist):
             pathlist = [pathlist]
-        for path in pathlist:
+        for path in filter(None, pathlist):
             if isinstance(path, SCons.Node.Node):
                 ret.append(path)
             else:
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index c5d064d..aba3481 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -1292,6 +1292,15 @@ class RepositoryTestCase(unittest.TestCase):
         list = map(str, fs.Rsearchall(['d3', work_d4]))
         assert list == ['d3', str(work_d4)], list
 
+        list = fs.Rsearchall('')
+        assert list == [], list
+
+        list = fs.Rsearchall([None])
+        assert list == [], list
+
+        list = fs.Rsearchall([''])
+        assert list == [], list
+
         fs.BuildDir('build', '.')
 
         f = fs.File(test.workpath("work", "i_do_not_exist"))