Euri-Linux/euri-iso
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

fix: address basestrap module findings (callback, -Sy->-S, umask guard, operations guard)

Browse Source
This commit is contained in:
c-ludenberg
2026-07-07 19:26:50 +02:00
parent 9dff90ef46
commit db809e6898
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py
+23 -14
View File
@@ -302,7 +302,7 @@ class PMPacman(PackageManager):
""" """
Call pacman in a loop until it is successful or the number of retries is exceeded Call pacman in a loop until it is successful or the number of retries is exceeded
:param command: The pacman command to run :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: :return:
""" """
@@ -310,7 +310,10 @@ class PMPacman(PackageManager):
while pacman_count <= self.pacman_num_retries: while pacman_count <= self.pacman_num_retries:
pacman_count += 1 pacman_count += 1
try: try:
host_env_process_output(command) if callback:
host_env_process_output(command, callback=self.line_cb)
else:
host_env_process_output(command)
return return
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
if pacman_count > self.pacman_num_retries: if pacman_count > self.pacman_num_retries:
@@ -343,7 +346,7 @@ class PMPacman(PackageManager):
if from_local: if from_local:
command.append("-U") command.append("-U")
else: else:
command.append("-Sy") command.append("-S")
command.append("--overwrite=*") command.append("--overwrite=*")
command += pkgs command += pkgs
@@ -376,17 +379,19 @@ class PMPacman(PackageManager):
def setup_requirements(self, rootdir): def setup_requirements(self, rootdir):
cal_umask = os.umask(0) cal_umask = os.umask(0)
for target in self.pacman_requirements: try:
dest = rootdir + target["dest"] for target in self.pacman_requirements:
if not os.path.exists(dest): dest = rootdir + target["dest"]
mod = int(target["mode"],8) if not os.path.exists(dest):
os.mkdir(dest, mode=mod) mod = int(target["mode"],8)
libcalamares.utils.debug("Mode: {!s}".format(oct(mod))) os.mkdir(dest, mode=mod)
libcalamares.utils.debug("Created: {!s}".format(dest)) libcalamares.utils.debug("Mode: {!s}".format(oct(mod)))
libcalamares.utils.debug("Created: {!s}".format(dest))
path = join(rootdir, "run") path = join(rootdir, "run")
os.chmod(path, 0o755) os.chmod(path, 0o755)
os.umask(cal_umask) finally:
os.umask(cal_umask)
def copy_file(self, rootdir, f): def copy_file(self, rootdir, f):
if os.path.exists(join("/",f)): if os.path.exists(join("/",f)):
@@ -533,7 +538,11 @@ def run():
if provider in known_inits: if provider in known_inits:
init_pkg = "-".join([base_init, provider]) init_pkg = "-".join([base_init, provider])
libcalamares.utils.debug("Init provider package added: {!s}".format(init_pkg)) 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("initProvider", provider)
libcalamares.globalstorage.insert("baseInit", base_init) libcalamares.globalstorage.insert("baseInit", base_init)
break break