MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-03-20 09:39:01 +00:00
Code Issues Releases Wiki Activity

Merge 146b463e1d1cdd492d3bce04a10ddc18ca2b7dc7 into c7e7e1d884d3bb241ea6448f72a989434c2a35ec

Browse Source
This commit is contained in:
Fernanda Guimarães 2024-05-11 07:28:15 +08:00 committed by GitHub
commit cbc50a0140
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
thefuck/output_readers/rerun.py
View File

@ -53,6 +53,7 @@ def get_output(script, expanded):
""" """
env = dict(os.environ) env = dict(os.environ)
env.update(settings.env) env.update(settings.env)
log_env = {key: env[key] for key in ['TF_SHELL', 'TF_ALIAS', 'TF_SHELL_ALIASES'] if key in env}
if six.PY2: if six.PY2:
expanded = expanded.encode('utf-8') expanded = expanded.encode('utf-8')
@ -60,7 +61,7 @@ def get_output(script, expanded):
split_expand = shlex.split(expanded) split_expand = shlex.split(expanded)
is_slow = split_expand[0] in settings.slow_commands if split_expand else False is_slow = split_expand[0] in settings.slow_commands if split_expand else False
with logs.debug_time(u'Call: {}; with env: {}; is slow: {}'.format( with logs.debug_time(u'Call: {}; with env: {}; is slow: {}'.format(
script, env, is_slow)): script, log_env, is_slow)):
result = Popen(expanded, shell=True, stdin=PIPE, result = Popen(expanded, shell=True, stdin=PIPE,
stdout=PIPE, stderr=STDOUT, env=env) stdout=PIPE, stderr=STDOUT, env=env)
if _wait_output(result, is_slow): if _wait_output(result, is_slow):