diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-12 00:08:14 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-12 00:08:14 (GMT) |
| commit | 055c8046afce036fdfad4bc8d60e4059da148f7d (patch) | |
| tree | a0baa510eabe64a7f50d3dd20e5640ac37b0eafa /src | |
| parent | 07b876177ce2d29d23fe998738cc04e40c8fa7e8 (diff) | |
| parent | 9a379c58daf528d1875bb0e902651162bc4f7bc6 (diff) | |
| download | SCons-055c8046afce036fdfad4bc8d60e4059da148f7d.zip SCons-055c8046afce036fdfad4bc8d60e4059da148f7d.tar.gz SCons-055c8046afce036fdfad4bc8d60e4059da148f7d.tar.bz2 | |
Merged in rodrigc/scons (pull request #404)
exec() must take a string, not a file object.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index a7c8a37..4e63f6c 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -165,7 +165,7 @@ def _SConscript(fs, *files, **kw): try: SCons.Script.sconscript_reading = SCons.Script.sconscript_reading + 1 if fn == "-": - exec(sys.stdin, call_stack[-1].globals) + exec(sys.stdin.read(), call_stack[-1].globals) else: if isinstance(fn, SCons.Node.Node): f = fn |