From de2d0959a10865e4e0ad4f6a33c3ca152b60401c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Tue, 7 Jul 2026 19:31:57 +0200 Subject: [PATCH] fix: pre-resolve subst_locale to avoid double call / locale drift --- .../usr/lib/calamares/modules/basestrap/main.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py index ccc7755..15549d2 100644 --- a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py +++ b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py @@ -547,16 +547,21 @@ def run(): mode_packages = None total_packages = 0 completed_packages = 0 + resolved_operations = [] for op in operations: - for packagelist in op.values(): - if isinstance(packagelist, list): - total_packages += len(subst_locale(packagelist)) + resolved_op = {} + for operation, packagelist in op.items(): + resolved_list = subst_locale(packagelist) if isinstance(packagelist, list) else packagelist + resolved_op[operation] = resolved_list + if isinstance(resolved_list, list): + total_packages += len(resolved_list) + resolved_operations.append(resolved_op) if not total_packages: # Avoids potential divide-by-zero in progress reporting return None - for entry in operations: + for entry in resolved_operations: group_packages = 0 libcalamares.utils.debug(pretty_name()) try: