valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

No need to check if process is alive. Fixes #16487. Refs #16317.

Browse Source 
There's no need to check for a live process because since we're changing flags on the file descriptor, if it's not none, we
reset the flags.
This commit is contained in:
Pedro Algarvio 2014-10-11 07:39:57 +01:00
parent bb7dd9c8b7
commit 79d89c7353
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/utils/vt.py
View File

@ -647,7 +647,7 @@ class Terminal(object):
self.child_fde = None
stderr = None
finally:
if self.isalive() and self.child_fde is not None:
if self.child_fde is not None:
fcntl.fcntl(self.child_fde, fcntl.F_SETFL, fde_flags)
# <---- Process STDERR -------------------------------------------
@ -677,7 +677,7 @@ class Terminal(object):
self.child_fd = None
stdout = None
finally:
if self.isalive() and self.child_fd is not None:
if self.child_fd is not None:
fcntl.fcntl(self.child_fd, fcntl.F_SETFL, fd_flags)
# <---- Process STDOUT -------------------------------------------
return stdout, stderr