Merge pull request #567 from adqm/xonsh_shell

Be more careful about __xonsh_shell__ (potential fix for #566)
This commit is contained in:
Anthony Scopatz 2015-12-07 20:44:37 -05:00
commit 5dc5d192c5

View file

@ -615,7 +615,10 @@ def run_subproc(cmds, captured=True):
})
if ENV.get('XONSH_INTERACTIVE') and not ENV.get('XONSH_STORE_STDOUT'):
# set title here to get current command running
builtins.__xonsh_shell__.settitle()
try:
builtins.__xonsh_shell__.settitle()
except AttributeError:
pass
if background:
return
if prev_is_proxy: