From 9cd0a4b73f4d284e1991360f316a1053a234f232 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 17 Nov 2019 23:06:09 +0000 Subject: Fixed some stuff --- archinstall.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'archinstall.py') diff --git a/archinstall.py b/archinstall.py index 5c261662..e43109b4 100644 --- a/archinstall.py +++ b/archinstall.py @@ -216,7 +216,7 @@ class sys_command():#Thread): if not 'emulate' in kwargs: kwargs['emulate'] = SAFETY_LOCK #Thread.__init__(self) if kwargs['emulate']: - print('Starting command in emulation mode.') + print(f"Starting command '{cmd}' in emulation mode.") self.cmd = shlex.split(cmd) self.args = args self.kwargs = kwargs @@ -494,7 +494,10 @@ def get_disk_size(drive): return ''.join(human_readable_size(fh.read().decode('UTF-8').strip())) def disk_info(drive, *positionals, **kwargs): - info = json.loads(b''.join(sys_command(f'lsblk -J -o "NAME,SIZE,FSTYPE,LABEL" {drive}', *positionals, **kwargs)).decode('UTF_8'))['blockdevices'][0] + lkwargs = {**kwargs} + lkwargs['emulate'] = False # This is a emulate-safe function. Does not alter filesystem. + + info = json.loads(b''.join(sys_command(f'lsblk -J -o "NAME,SIZE,FSTYPE,LABEL" {drive}', *positionals, **lkwargs)).decode('UTF_8'))['blockdevices'][0] fileformats = [] labels = [] for child in info['children']: -- cgit v1.2.3-70-g09d2