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

fix: merge gitlab (keep -Sy with rationale comment)

Browse Source
This commit is contained in:
c-ludenberg
2026-07-07 19:34:25 +02:00
parent 7d081c4730 daf7c6e648
commit 988547c94b
1 changed files with 6 additions and 5 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
+5 -4
View File
@@ -344,7 +344,8 @@ class PMPacman(PackageManager):
if from_local: if from_local:
command.append("-U") command.append("-U")
else: else:
command.append("-S") # -Sy is intentional: fresh chroot has no pacman DB, must sync first
command.append("-Sy")
command.append("--overwrite=*") command.append("--overwrite=*")
command += pkgs command += pkgs
@@ -388,9 +389,9 @@ class PMPacman(PackageManager):
path = join(rootdir, "run") path = join(rootdir, "run")
os.chmod(path, 0o755) os.chmod(path, 0o755)
def copy_file(self, rootdir, f): def copy_file(self, rootdir, relative_path):
if os.path.exists(join("/",f)): if os.path.exists(join("/", relative_path)):
shutil.copy2(join("/",f), join(rootdir, f)) shutil.copy2(join("/", relative_path), join(rootdir, relative_path))
def init_keyring(self): def init_keyring(self):
target_env_process_output(["pacman-key", "--init"]) target_env_process_output(["pacman-key", "--init"])