diff options
| author | Steven Knight <knight@baldmt.com> | 2004-07-30 17:43:29 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-07-30 17:43:29 (GMT) |
| commit | 5e99c7b81daa264a1dad5548e62892963fbd8118 (patch) | |
| tree | 9a53e3b6b342cb891065c7e4d11c50f5466428a9 /src/engine | |
| parent | b5f762338c061c48728683d2ee0f037cebd0ab61 (diff) | |
| download | SCons-5e99c7b81daa264a1dad5548e62892963fbd8118.zip SCons-5e99c7b81daa264a1dad5548e62892963fbd8118.tar.gz SCons-5e99c7b81daa264a1dad5548e62892963fbd8118.tar.bz2 | |
Fix null entries in CPPPATH. (Gary Oberbrunner)
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FSTests.py | 9 |
2 files changed, 10 insertions, 1 deletions
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")) |