diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-23 18:12:18 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-23 18:12:18 (GMT) |
| commit | f0870bd9f7df160c1102eb83d9d5768f9bed8dcf (patch) | |
| tree | 590548de4dd2caa4f69b89fb4bd02becfa6a34a8 | |
| parent | aabc6a4baf5371b376aae1ee1d805fc112cba75a (diff) | |
| parent | 6f86f92d792da7edd0a638ca2a49fe443b042709 (diff) | |
| download | SCons-f0870bd9f7df160c1102eb83d9d5768f9bed8dcf.zip SCons-f0870bd9f7df160c1102eb83d9d5768f9bed8dcf.tar.gz SCons-f0870bd9f7df160c1102eb83d9d5768f9bed8dcf.tar.bz2 | |
Merged in ptomulik/scons (pull request #123)
Fixed "communicate()" interface in Action._subproc() dummyPopen
| -rw-r--r-- | src/engine/SCons/Action.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index a6dbb7c..33d8790 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -679,7 +679,7 @@ def _subproc(scons_env, cmd, error = 'ignore', **kw): # return a dummy Popen instance that only returns error class dummyPopen(object): def __init__(self, e): self.exception = e - def communicate(self): return ('','') + def communicate(self,input=None): return ('','') def wait(self): return -self.exception.errno stdin = None class f(object): |