diff --git a/common/tools.py b/common/tools.py index b7988cb..ccb2000 100644 --- a/common/tools.py +++ b/common/tools.py @@ -1,14 +1,14 @@ -def log_check_call(command, input=None): - status, stdout, stderr = log_call(command, input) +def log_check_call(command, stdin=None): + status, stdout, stderr = log_call(command, stdin) if status != 0: from subprocess import CalledProcessError raise CalledProcessError(status, ' '.join(command), '\n'.join(stderr)) return stdout -def log_call(command, input=None): +def log_call(command, stdin=None): import subprocess import select @@ -17,13 +17,11 @@ def log_call(command, input=None): command_log = realpath(command[0]).replace('/', '.') log = logging.getLogger(__name__ + command_log) - if input is not None: + if stdin is not None: process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - process.stdin.write(input+"\n") + process.stdin.write(stdin+"\n") process.stdin.flush() process.stdin.close() - # (stdout,stderr) = process.communicate(input+"\n") - # return process.returncode, stdout, stderr else: process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout = []