RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improving SysCommandWorker() to handle buffered output.

This commit is contained in:
Anton Hvornum 2022-02-09 15:25:03 +01:00
parent 563f15db4d
commit 1a82934a3c
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archinstall/lib/general.py
View File

@ -284,7 +284,13 @@ class SysCommandWorker:
self.make_sure_we_are_executing() self.make_sure_we_are_executing()
if self.child_fd: if self.child_fd:
return os.write(self.child_fd, data + (b'\n' if line_ending else b'')) written_data = os.write(self.child_fd, data + (b'\n' if line_ending else b''))
os.fsync(self.child_fd)
with open('debug_write.txt', 'a') as silent_output:
silent_output.write(f'Wrote {[data + (b'\n' if line_ending else b'')]}\n')
return written_data
return 0 return 0
@ -354,6 +360,10 @@ class SysCommandWorker:
# stdout of the child_fd object. `os.read(self.child_fd, 8192)` is the # stdout of the child_fd object. `os.read(self.child_fd, 8192)` is the
# only way to get the traceback without loosing it. # only way to get the traceback without loosing it.
# We need to flush any pending output to the parent
# otherwise it will bleed into the child: https://docs.python.org/3/library/os.html#os.execvpe
sys.stdout.flush()
self.pid, self.child_fd = pty.fork() self.pid, self.child_fd = pty.fork()
os.chdir(old_dir) os.chdir(old_dir)