diff options
| author | Steven Knight <knight@baldmt.com> | 2002-07-29 23:22:50 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-07-29 23:22:50 (GMT) |
| commit | 7b142dbd32c3673ae57bda1fea98a8d8e3f7d0e5 (patch) | |
| tree | 852f6c632d1f018e22d22aa459f2c9753c66ba59 /src/engine/SCons/Script | |
| parent | cd6d3c9e4f76592845cf32e11cee9a04c1b2f0f6 (diff) | |
| download | SCons-7b142dbd32c3673ae57bda1fea98a8d8e3f7d0e5.zip SCons-7b142dbd32c3673ae57bda1fea98a8d8e3f7d0e5.tar.gz SCons-7b142dbd32c3673ae57bda1fea98a8d8e3f7d0e5.tar.bz2 | |
Multiple directory .h includes in Repositories.
Diffstat (limited to 'src/engine/SCons/Script')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 10 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index e088c99..38fd080 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -162,11 +162,11 @@ def SConscript(*ls, **kw): if fn == "-": exec sys.stdin in stack[-1].globals else: - if isinstance(fn, SCons.Node.Node): - f = fn - else: - f = SCons.Node.FS.default_fs.File(str(fn)) - if f.exists(): + if isinstance(fn, SCons.Node.Node): + f = fn + else: + f = SCons.Node.FS.default_fs.File(str(fn)) + if f.rexists(): file = open(f.rstr(), "r") SCons.Node.FS.default_fs.chdir(f.dir) if sconscript_chdir: diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 10794f5..17a1256 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -835,7 +835,7 @@ def _SConstruct_exists(dirname=''): sfile = os.path.join(dirname, file) if os.path.isfile(sfile): return sfile - if not os.path.isabs(file): + if not os.path.isabs(sfile): for rep in repositories: if os.path.isfile(os.path.join(rep, sfile)): return sfile |