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

Changed flush() method to child fd

This commit is contained in:
Anton Hvornum 2022-02-09 15:39:58 +01:00
parent e2f42065d7
commit 5777ff9061
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall/lib/general.py
View File

@ -279,20 +279,20 @@ class SysCommandWorker:
return False return False
def write(self, data: bytes, line_ending :bool = True) -> int: def write(self, data: bytes, line_ending :bool = True) -> int:
assert type(data) == bytes # TODO: Maybe we can support str as well and encode it if type(data) != bytes:
raise AssertionError(f"SysCommandWorker().write() requires bytes data to be written, not type({type(data)}).")
self.make_sure_we_are_executing() self.make_sure_we_are_executing()
with open('debug_write.txt', 'a') as silent_output: with open('debug_write.txt', 'a') as silent_output:
silent_output.write(f"Writing to {self.child_fd}")
if self.child_fd: if self.child_fd:
written_data = os.write(self.child_fd, data + (b'\n' if line_ending else b'')) data = data + (b'\n' if line_ending else b'')
written_data = os.write(self.child_fd, data)
sys.stdout.flush() sys.stdout.flush()
# os.fsync(self.child_fd) # <-- Will generate OSError: [Error 22] Invalid argument # os.fsync(self.child_fd) # <-- Will generate OSError: [Error 22] Invalid argument
written_data_string = data + (b'\n' if line_ending else b'') silent_output.write(f"Wrote {written_data}: {[written_data_string]}\n")
silent_output.write(f"Wrote {[written_data_string]}\n")
return written_data return written_data