DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

make-release.py: Send stderr to stdout

Browse Source
This commit is contained in:
Jack Grigg
2017-09-18 10:45:03 +01:00
parent d9d33a4b78
commit fd5724eca7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zcutil/make-release.py
View File

@@ -335,8 +335,9 @@ def sh_out(*args):
def sh_log(*args): def sh_log(*args):
PIPE = subprocess.PIPE PIPE = subprocess.PIPE
STDOUT = subprocess.STDOUT
try: try:
p = subprocess.Popen(args, stdout=PIPE, stderr=PIPE, stdin=None) p = subprocess.Popen(args, stdout=PIPE, stderr=STDOUT, stdin=None)
except OSError: except OSError:
logging.error('Error launching %r...', args) logging.error('Error launching %r...', args)
raise raise
@@ -357,8 +358,9 @@ def sh_progress(markers, *args):
return return
PIPE = subprocess.PIPE PIPE = subprocess.PIPE
STDOUT = subprocess.STDOUT
try: try:
p = subprocess.Popen(args, stdout=PIPE, stderr=PIPE, stdin=None) p = subprocess.Popen(args, stdout=PIPE, stderr=STDOUT, stdin=None)
except OSError: except OSError:
logging.error('Error launching %r...', args) logging.error('Error launching %r...', args)
raise raise