Merge branch 'archlinux:master' into master

archlinux · Nov 9, 2023 · c33ef29 · c33ef29
2 parents 12a4f7f + af6713e
commit c33ef29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py
@@ -90,14 +90,14 @@ def encrypt(
 		# Retry formatting the volume because archinstall can some times be too quick
 		# which generates a "Device /dev/sdX does not exist or access denied." between
 		# setting up partitions and us trying to encrypt it.
-		for retry_attempt in range(storage['DISK_RETRY_ATTEMPTS']):
+		for retry_attempt in range(storage['DISK_RETRY_ATTEMPTS'] + 1):
 			try:
 				SysCommand(cryptsetup_args)
 				break
 			except SysCallError as err:
 				time.sleep(storage['DISK_TIMEOUTS'])
 
-				if retry_attempt != storage['DISK_RETRY_ATTEMPTS'] - 1:
+				if retry_attempt != storage['DISK_RETRY_ATTEMPTS']:
 					continue
 
 				if err.exit_code == 1:

diff --git a/pyproject.toml b/pyproject.toml
@@ -19,7 +19,7 @@ classifiers = [
 ]
 dependencies = [
     "pyparted==3.12.0",
-    "simple-term-menu==1.6.1",
+    "simple-term-menu==1.6.2",
 ]
 
 [project.urls]