Commit c7d53b42 by Calen Pennington

Use subprocess.STDOUT, rather than sys.STDOUT to rebind stderr

parent 636122c0
...@@ -11,7 +11,7 @@ def execute(command, working_directory=BASE_DIR): ...@@ -11,7 +11,7 @@ def execute(command, working_directory=BASE_DIR):
Output is ignored. Output is ignored.
""" """
LOG.info(command) LOG.info(command)
subprocess.check_call(command, cwd=working_directory, stderr=sys.STDOUT, shell=True) subprocess.check_call(command, cwd=working_directory, stderr=subprocess.STDOUT, shell=True)
def call(command, working_directory=BASE_DIR): def call(command, working_directory=BASE_DIR):
...@@ -22,7 +22,7 @@ def call(command, working_directory=BASE_DIR): ...@@ -22,7 +22,7 @@ def call(command, working_directory=BASE_DIR):
""" """
LOG.info(command) LOG.info(command)
p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=working_directory) p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=working_directory, shell=True)
out, err = p.communicate() out, err = p.communicate()
return (out, err) return (out, err)
......
...@@ -39,7 +39,7 @@ def msgfmt_check_po_file(filename): ...@@ -39,7 +39,7 @@ def msgfmt_check_po_file(filename):
""" """
# Use relative paths to make output less noisy. # Use relative paths to make output less noisy.
rfile = os.path.relpath(filename, LOCALE_DIR) rfile = os.path.relpath(filename, LOCALE_DIR)
out, err = call(['msgfmt', '-c', rfile], working_directory=LOCALE_DIR) out, err = call('msgfmt -c {}'.format(rfile), working_directory=LOCALE_DIR)
if err != '': if err != '':
log.info('\n' + out) log.info('\n' + out)
log.warn('\n' + err) log.warn('\n' + err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment