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

Added error handling to sys_command's peak function.

This commit is contained in:
Anton Hvornum 2021-04-04 15:13:06 +02:00
parent 2f6a71756a
commit 81822e6444
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall/lib/general.py
View File

@ -159,10 +159,16 @@ class sys_command():#Thread):
'exit_code': self.exit_code 'exit_code': self.exit_code
} }
def peak(self, output): def peak(self, output :str):
if type(output) == bytes:
try:
output = output.decode('UTF-8')
except UnicodeDecodeError:
return None
if self.peak_output: if self.peak_output:
from .user_interaction import get_terminal_width from .user_interaction import get_terminal_width
# Move back to the beginning of the terminal # Move back to the beginning of the terminal
sys.stdout.flush() sys.stdout.flush()
sys.stdout.write("\033[%dG" % 0) sys.stdout.write("\033[%dG" % 0)

2
archinstall/lib/installer.py
View File

@ -137,7 +137,7 @@ class Installer():
self.log(f'Installing packages: {packages}', level=LOG_LEVELS.Info) self.log(f'Installing packages: {packages}', level=LOG_LEVELS.Info)
if (sync_mirrors := sys_command('/usr/bin/pacman -Syy')).exit_code == 0: if (sync_mirrors := sys_command('/usr/bin/pacman -Syy')).exit_code == 0:
if (pacstrap := sys_command(f'/usr/bin/pacstrap {self.mountpoint} {" ".join(packages)}', **kwargs)).exit_code == 0: if (pacstrap := sys_command(f'/usr/bin/pacstrap {self.mountpoint} {" ".join(packages)}', peak_output=True, **kwargs)).exit_code == 0:
return True return True
else: else:
self.log(f'Could not strap in packages: {pacstrap.exit_code}', level=LOG_LEVELS.Info) self.log(f'Could not strap in packages: {pacstrap.exit_code}', level=LOG_LEVELS.Info)