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

Merge branch 'sf' of https://github.com/scopatz/xonsh into scopatz-fixes

Browse source
This commit is contained in:
adam j hartz 2016-01-10 18:23:24 -05:00
commit 4ae753f302
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xonsh/aliases.py
View file

@ -91,7 +91,7 @@ def source_foreign(args, stdin=None):
env = builtins.__xonsh_env__ env = builtins.__xonsh_env__
denv = env.detype() denv = env.detype()
for k, v in fsenv.items(): for k, v in fsenv.items():
if k in env and v == denv[k]: if k in denv and v == denv[k]:
continue # no change from original continue # no change from original
env[k] = v env[k] = v
baliases = builtins.aliases baliases = builtins.aliases