fix: add --ask=4 safety net for init-rc conflicts in all three pacman code paths
--ignore alone doesn't reliably prevent provider resolution during fresh pacman -S installs. --ask=4 auto-answers YES to conflict resolution questions (e.g. 'remove dinit-rc?') with --noconfirm, providing a safety net when --ignore doesn't prevent the dinit-rc vs openrc conflict. All three code paths updated: - buildiso: make_rootfs() basestrap call - basestrap/main.py: PMPacman.install() - packages/main.py: PMPacman.install()
This commit is contained in:
@@ -357,6 +357,10 @@ class PMPacman(PackageManager):
|
||||
ignore_pkg = f"{base_init}-{p}"
|
||||
command.append(f"--ignore={ignore_pkg}")
|
||||
|
||||
# Safety net: auto-answer YES to conflict resolution (e.g.
|
||||
# "remove dinit-rc?") if --ignore doesn't prevent the conflict.
|
||||
command.append("--ask=4")
|
||||
|
||||
if self.pacman_needed_only:
|
||||
command.append("--needed")
|
||||
|
||||
|
||||
@@ -233,6 +233,9 @@ class PMPacman(PackageManager):
|
||||
for p in sorted_inits[:idx]:
|
||||
command.append(f"--ignore={base_init}-{p}")
|
||||
|
||||
# Safety net: auto-answer YES to conflict resolution
|
||||
command.append("--ask=4")
|
||||
|
||||
if self.pacman_needed_only is True:
|
||||
command.append("--needed")
|
||||
if self.pacman_disable_timeout is True:
|
||||
|
||||
Reference in New Issue
Block a user