From c6fdf775c8b601a9b94f7c12849276e0b6fe0bfe Mon Sep 17 00:00:00 2001 From: Romain Goncalves Date: Sat, 8 Jan 2022 21:16:19 +0100 Subject: partition.py: Use exit code for mkfs.fat exception (#853) When using archinstall on an existing Arch Linux installation, (e.g. for migrating the current system on a new drive), no exception is raised if mkfs.vfat is missing in the base install (no dosfstools package currently installed). --- archinstall/lib/disk/partition.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/disk/partition.py b/archinstall/lib/disk/partition.py index b8fa2b79..56ead68c 100644 --- a/archinstall/lib/disk/partition.py +++ b/archinstall/lib/disk/partition.py @@ -299,9 +299,8 @@ class Partition: elif filesystem == 'fat32': options = ['-F32'] + options - mkfs = SysCommand(f"/usr/bin/mkfs.vfat {' '.join(options)} {path}").decode('UTF-8') - if ('mkfs.fat' not in mkfs and 'mkfs.vfat' not in mkfs) or 'command not found' in mkfs: - raise DiskError(f"Could not format {path} with {filesystem} because: {mkfs}") + if (handle := SysCommand(f"/usr/bin/mkfs.vfat {' '.join(options)} {path}")).exit_code != 0: + raise DiskError(f"Could not format {path} with {filesystem} because: {handle.decode('UTF-8')}") self.filesystem = filesystem elif filesystem == 'ext4': -- cgit v1.2.3-54-g00ecf