mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-05 17:00:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nicfit-cmderrors'

Browse source
This commit is contained in:
Anthony Scopatz 2015-11-27 11:36:45 -05:00
commit 1320484bf9
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xonsh/proc.py
View file

@ -16,8 +16,8 @@ from threading import Thread
from collections import Sequence
from subprocess import Popen, PIPE, DEVNULL, STDOUT, TimeoutExpired
from xonsh.tools import redirect_stdout, redirect_stderr, ON_WINDOWS, ON_LINUX, \
fallback, print_exception
from xonsh.tools import (redirect_stdout, redirect_stderr, ON_WINDOWS, ON_LINUX,
fallback, print_exception)
if ON_LINUX:
from xonsh.teepty import TeePTY
@ -336,6 +336,8 @@ class SimpleProcProxy(ProcProxy):
i = stdin.read()
with redirect_stdout(stdout), redirect_stderr(stderr):
r = f(args, i)
cmd_result = 0
if isinstance(r, str):
stdout.write(r)
elif isinstance(r, Sequence):
@ -343,9 +345,11 @@ class SimpleProcProxy(ProcProxy):
stdout.write(r[0])
if r[1] is not None:
stderr.write(r[1])
if len(r) > 2 and r[2] is not None:
cmd_result = r[2]
elif r is not None:
stdout.write(str(r))
return 0 # returncode for succees
return cmd_result
except Exception:
print_exception()
return 1 # returncode for failure