diff options
| author | Steven Knight <knight@baldmt.com> | 2002-05-02 18:32:06 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-05-02 18:32:06 (GMT) |
| commit | deb10649b8ca07fe7fab0b7e1f32075f22140da4 (patch) | |
| tree | 2d50c1d738110a476e4fe2d518eff6fafda47ea9 /src | |
| parent | 971823ece48d9eae019eeca0ec7c8712764bc839 (diff) | |
| download | SCons-deb10649b8ca07fe7fab0b7e1f32075f22140da4.zip SCons-deb10649b8ca07fe7fab0b7e1f32075f22140da4.tar.gz SCons-deb10649b8ca07fe7fab0b7e1f32075f22140da4.tar.bz2 | |
Fix a bug that caused BuildDir(duplicate=1) along with passing a Node to SConscript() to act as if BuildDir() wasn't used.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index caaaf3e..3dc11da 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -150,6 +150,8 @@ RELEASE 0.07 - Thu, 25 Apr 2002 06:24:50 -0500 - Fix for using Aliases with the -u, -U and -D options. + - Fix so that Nodes can be passed to SConscript files. + From Moshe Zadka: - Changes for official Debian packaging. diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 79e2a60..606be08 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -158,7 +158,10 @@ def SConscript(*ls, **kw): if fn == "-": exec sys.stdin in stack[-1].globals else: - f = SCons.Node.FS.default_fs.File(str(fn)) + if isinstance(fn, SCons.Node.Node): + f = fn + else: + f = SCons.Node.FS.default_fs.File(str(fn)) if f.exists(): file = open(str(f), "r") SCons.Node.FS.default_fs.chdir(f.dir) |