diff options
| author | Mats Wichmann <mats@linux.com> | 2019-04-26 17:10:19 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-04-26 19:11:59 (GMT) |
| commit | 15326cf04732bbcc5ef62c5452349a4bd029b70e (patch) | |
| tree | 8a7f61381f13838164e43bcb533adf1e5efd93ee /src/engine/SCons/Action.py | |
| parent | 0e84c296d686e4384c8e6f5137a7c15e51dcb167 (diff) | |
| download | SCons-15326cf04732bbcc5ef62c5452349a4bd029b70e.zip SCons-15326cf04732bbcc5ef62c5452349a4bd029b70e.tar.gz SCons-15326cf04732bbcc5ef62c5452349a4bd029b70e.tar.bz2 | |
[PR #3345] fix more PY3.8 fails
File closes in msvs tool
Context manager in rpm tool
Dummy compiler, assembler scripts can be called in unexpected
ways (namely by gcc tool init), which passes --version flag.
don't take exception on the getopt call.
Try again to undo my breakage of _subproc, which was failing on Win+PY27
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'src/engine/SCons/Action.py')
| -rw-r--r-- | src/engine/SCons/Action.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index fd859ad..f1d4d28 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -784,10 +784,7 @@ def _subproc(scons_env, cmd, error = 'ignore', **kw): if DEVNULL: kw[stream] = DEVNULL else: - if sys.platform == 'win32': - kw[stream] = msvcrt.get_osfhandle(os.open(os.devnull, os.O_RDWR)) - else: - kw[stream] = open(os.devnull, "r+") + kw[stream] = open(os.devnull, "r+") # Figure out what shell environment to use ENV = kw.get('env', None) |