Tweaked SysCallError() exception to include the exit code in a machine readable manner. Since it's useful as an indicator where calls might go wrong and for what reason.

3 files changed, 14 insertions, 7 deletions

diff --git a/archinstall/lib/exceptions.py b/archinstall/lib/exceptions.py
index 5a5d47c6..558a397d 100644
--- a/archinstall/lib/exceptions.py
+++ b/archinstall/lib/exceptions.py
@@ -7,7 +7,10 @@ class UnknownFilesystemFormat(BaseException):
 class ProfileError(BaseException):
 	pass
 class SysCallError(BaseException):
-	pass
+	def __init__(self, message, error_code):
+		super(SysCallError, self).__init__(message)
+		self.message = message
+		self.error_code = error_code
 class ProfileNotFound(BaseException):
 	pass
 class HardwareIncompatibilityError(BaseException):
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index e87e4102..28fc0934 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -251,7 +251,7 @@ class sys_command():#Thread):
 		if self.exit_code != 0 and not self.kwargs['suppress_errors']:
 			#self.log(self.trace_log.decode('UTF-8'), level=LOG_LEVELS.Debug)
 			#self.log(f"'{self.raw_cmd}' did not exit gracefully, exit code {self.exit_code}.", level=LOG_LEVELS.Error)
-			raise SysCallError(f"{self.trace_log.decode('UTF-8')}\n'{self.raw_cmd}' did not exit gracefully (trace log above), exit code: {self.exit_code}")
+			raise SysCallError(message=f"{self.trace_log.decode('UTF-8')}\n'{self.raw_cmd}' did not exit gracefully (trace log above), exit code: {self.exit_code}", exit_code=self.exit_code)
 
 		self.ended = time.time()
 		with open(f'{self.cwd}/trace.log', 'wb') as fh:
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py
index de53c05e..a4d2a07d 100644
--- a/archinstall/lib/luks.py
+++ b/archinstall/lib/luks.py
@@ -64,12 +64,16 @@ class luks2():
 		with open(key_file, 'wb') as fh:
 			fh.write(password)
 
-		cmd_handle = sys_command(f'/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash {hash_type} --key-size {key_size} --iter-time {iter_time} --key-file {os.path.abspath(key_file)} --use-urandom luksFormat {partition.path}')
-		if cmd_handle.exit_code == 256:
-			# Partition was in use, unmount it and 
-			partition.unmount()
-			sys_command(f'cryptsetup close {partition.path}')
+		try:
 			cmd_handle = sys_command(f'/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash {hash_type} --key-size {key_size} --iter-time {iter_time} --key-file {os.path.abspath(key_file)} --use-urandom luksFormat {partition.path}')
+		except SysCallError as err:
+			if err.exit_code == 256:
+				# Partition was in use, unmount it and try again
+				partition.unmount()
+				sys_command(f'cryptsetup close {partition.path}')
+				cmd_handle = sys_command(f'/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash {hash_type} --key-size {key_size} --iter-time {iter_time} --key-file {os.path.abspath(key_file)} --use-urandom luksFormat {partition.path}')
+			else:
+				raise err
 
 		if b'Command successful.' not in b''.join(cmd_handle):
 			raise DiskError(f'Could not encrypt volume "{partition.path}": {o}')