Merge branch 'wrywerytwreywery-ssh_fixes'

This commit is contained in:
Anthony Scopatz 2015-04-01 08:51:32 -05:00
commit b21a3e180c
2 changed files with 2 additions and 2 deletions

View file

@ -1,3 +1,3 @@
#!/usr/bin/env python
#!/usr/bin/env python -u
from xonsh.main import main
main()

View file

@ -49,7 +49,7 @@ def _give_terminal_to(pgid):
# over-simplified version of:
# give_terminal_to from bash 4.3 source, jobs.c, line 4030
# this will give the terminal to the process group pgid
if _shell_tty is not None:
if _shell_tty is not None and os.isatty(_shell_tty):
oldmask = signal.pthread_sigmask(signal.SIG_BLOCK, _block_when_giving)
os.tcsetpgrp(_shell_tty, pgid)
signal.pthread_sigmask(signal.SIG_SETMASK, oldmask)