Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/general.py10
-rw-r--r--archinstall/lib/installer.py2
2 files changed, 9 insertions, 3 deletions
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index ded2c5a3..41a83651 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -159,10 +159,16 @@ class sys_command():#Thread):
'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:
from .user_interaction import get_terminal_width
-
+
# Move back to the beginning of the terminal
sys.stdout.flush()
sys.stdout.write("\033[%dG" % 0)
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index c0323c61..a99bc944 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -137,7 +137,7 @@ class Installer():
self.log(f'Installing packages: {packages}', level=LOG_LEVELS.Info)
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
else:
self.log(f'Could not strap in packages: {pacstrap.exit_code}', level=LOG_LEVELS.Info)