From daf7c6e648af5b68d1a9af5d95a2cdace5e0d14f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Tue, 7 Jul 2026 19:33:19 +0200 Subject: [PATCH] chore: minor PEP8 fixes, add -Sy rationale comment --- .../usr/lib/calamares/modules/basestrap/main.py | 9 +++++---- 1 file changed, 5 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 15549d2..f90e32d 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 @@ -344,6 +344,7 @@ class PMPacman(PackageManager): if from_local: command.append("-U") else: + # -Sy is intentional: fresh chroot has no pacman DB, must sync first command.append("-Sy") command.append("--overwrite=*") @@ -379,7 +380,7 @@ class PMPacman(PackageManager): for target in self.pacman_requirements: dest = rootdir + target["dest"] if not os.path.exists(dest): - mod = int(target["mode"],8) + mod = int(target["mode"], 8) os.mkdir(dest) os.chmod(dest, mod) libcalamares.utils.debug("Mode: {!s}".format(oct(mod))) @@ -388,9 +389,9 @@ class PMPacman(PackageManager): path = join(rootdir, "run") os.chmod(path, 0o755) - def copy_file(self, rootdir, f): - if os.path.exists(join("/",f)): - shutil.copy2(join("/",f), join(rootdir, f)) + def copy_file(self, rootdir, relative_path): + if os.path.exists(join("/", relative_path)): + shutil.copy2(join("/", relative_path), join(rootdir, relative_path)) def init_keyring(self): target_env_process_output(["pacman-key", "--init"])