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

Fix `exit_code` (#1679)

This commit is contained in:
codefiles 2023-03-14 16:24:15 -04:00 committed by GitHub
parent f0a6adb96d
commit 79eb6bba62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/general.py
View File

@ -355,10 +355,12 @@ class SysCommandWorker:
if self.ended or (got_output is False and pid_exists(self.pid) is False): if self.ended or (got_output is False and pid_exists(self.pid) is False):
self.ended = time.time() self.ended = time.time()
try: try:
self.exit_code = os.waitpid(self.pid, 0)[1] wait_status = os.waitpid(self.pid, 0)[1]
self.exit_code = os.waitstatus_to_exitcode(wait_status)
except ChildProcessError: except ChildProcessError:
try: try:
self.exit_code = os.waitpid(self.child_fd, 0)[1] wait_status = os.waitpid(self.child_fd, 0)[1]
self.exit_code = os.waitstatus_to_exitcode(wait_status)
except ChildProcessError: except ChildProcessError:
self.exit_code = 1 self.exit_code = 1