mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-25 17:52:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dont hang trying to read shell environment if the shell never quits. Fixes #2143

Browse Source
This commit is contained in:
Kovid Goyal
2019-11-20 11:52:25 +05:30
parent 738878c2ff
commit c510584afd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kitty/main.py
View File

@@ -214,7 +214,9 @@ def read_shell_environment(opts=None):
with os.fdopen(master, 'rb') as stdout, os.fdopen(slave, 'wb'): with os.fdopen(master, 'rb') as stdout, os.fdopen(slave, 'wb'):
raw = b'' raw = b''
from subprocess import TimeoutExpired from subprocess import TimeoutExpired
while True: from time import monotonic
start_time = monotonic()
while monotonic() - start_time < 1.5:
try: try:
ret = p.wait(0.01) ret = p.wait(0.01)
except TimeoutExpired: except TimeoutExpired:
@@ -223,7 +225,10 @@ def read_shell_environment(opts=None):
raw += stdout.read() raw += stdout.read()
if ret is not None: if ret is not None:
break break
if p.returncode == 0: if p.returncode is None:
log_error('Timed out waiting for shell to quit while reading shell environment')
p.kill()
elif p.returncode == 0:
while True: while True:
try: try:
x = stdout.read() x = stdout.read()