Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions archinstall/lib/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ def __init__(
self._trace_log_pos = 0
self.poll_object = epoll()
self.child_fd: int | None = None
self.started: float | None = None
self.ended: float | None = None
self.started = False
self.ended = False
self.remove_vt100_escape_codes_from_lines: bool = remove_vt100_escape_codes_from_lines

def __contains__(self, key: bytes) -> bool:
Expand Down Expand Up @@ -117,7 +117,7 @@ def __exit__(self, exc_type: type[BaseException] | None, exc_value: BaseExceptio
def is_alive(self) -> bool:
self.poll()

if self.started and self.ended is None:
if self.started and not self.ended:
return True

return False
Expand Down Expand Up @@ -173,11 +173,11 @@ def poll(self) -> None:
self.peak(output)
self._trace_log += output
except OSError:
self.ended = time.time()
self.ended = True
break

if self.ended or (not got_output and not _pid_exists(self.pid)):
self.ended = time.time()
self.ended = True
try:
wait_status = os.waitpid(self.pid, 0)[1]
self.exit_code = os.waitstatus_to_exitcode(wait_status)
Expand Down Expand Up @@ -215,7 +215,7 @@ def execute(self) -> bool:
# Only parent process moves back to the original working directory
os.chdir(old_dir)

self.started = time.time()
self.started = True
self.poll_object.register(self.child_fd, EPOLLIN | EPOLLHUP)

return True
Expand Down