From 809f8bcafa86b08e21409275637710cdcbe32bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82?= <ash8820@proton.me>
Date: Tue, 7 Jul 2026 19:26:44 +0200
Subject: [PATCH] fix: address basestrap module findings (callback, umask
 guard, operations guard)

---
 .../lib/calamares/modules/basestrap/main.py   | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 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 74ba773..246ae25 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
@@ -302,7 +302,7 @@ class PMPacman(PackageManager):
         """
         Call pacman in a loop until it is successful or the number of retries is exceeded
         :param command: The pacman command to run
-        :param callback: An optional boolean that indicates if this pacman run should use the callback
+        :param callback: If True, process output using self.line_cb
         :return:
         """
 
@@ -310,7 +310,10 @@ class PMPacman(PackageManager):
         while pacman_count <= self.pacman_num_retries:
             pacman_count += 1
             try:
-                host_env_process_output(command)
+                if callback:
+                    host_env_process_output(command, callback=self.line_cb)
+                else:
+                    host_env_process_output(command)
                 return
             except subprocess.CalledProcessError:
                 if pacman_count > self.pacman_num_retries:
@@ -376,17 +379,19 @@ class PMPacman(PackageManager):
 
     def setup_requirements(self, rootdir):
         cal_umask = os.umask(0)
-        for target in self.pacman_requirements:
-            dest = rootdir + target["dest"]
-            if not os.path.exists(dest):
-                mod = int(target["mode"],8)
-                os.mkdir(dest, mode=mod)
-                libcalamares.utils.debug("Mode: {!s}".format(oct(mod)))
-                libcalamares.utils.debug("Created: {!s}".format(dest))
+        try:
+            for target in self.pacman_requirements:
+                dest = rootdir + target["dest"]
+                if not os.path.exists(dest):
+                    mod = int(target["mode"],8)
+                    os.mkdir(dest, mode=mod)
+                    libcalamares.utils.debug("Mode: {!s}".format(oct(mod)))
+                    libcalamares.utils.debug("Created: {!s}".format(dest))
 
-        path = join(rootdir, "run")
-        os.chmod(path, 0o755)
-        os.umask(cal_umask)
+            path = join(rootdir, "run")
+            os.chmod(path, 0o755)
+        finally:
+            os.umask(cal_umask)
 
     def copy_file(self, rootdir, f):
         if os.path.exists(join("/",f)):
@@ -533,7 +538,11 @@ def run():
             if provider in known_inits:
                 init_pkg = "-".join([base_init, provider])
                 libcalamares.utils.debug("Init provider package added: {!s}".format(init_pkg))
-                operations[0]["install"].append(init_pkg)
+                if operations and isinstance(operations[0], dict) and isinstance(operations[0].get("install"), list):
+                    operations[0]["install"].append(init_pkg)
+                else:
+                    libcalamares.utils.warning(
+                        "Cannot add init provider package: missing operations[0]['install'] list")
                 libcalamares.globalstorage.insert("initProvider", provider)
                 libcalamares.globalstorage.insert("baseInit", base_init)
                 break