Skip to content

Commit fbaa281

Browse files
committed
Refactor set_mirrors()
1 parent ae3b0f8 commit fbaa281

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

archinstall/lib/installer.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -478,27 +478,24 @@ def set_mirrors(self, mirror_config: MirrorConfiguration, on_target: bool = Fals
478478
if result := plugin.on_mirrors(mirror_config):
479479
mirror_config = result
480480

481-
if on_target:
482-
local_pacman_conf = Path(f'{self.target}/etc/pacman.conf')
483-
local_mirrorlist_conf = Path(f'{self.target}/etc/pacman.d/mirrorlist')
484-
else:
485-
local_pacman_conf = Path('/etc/pacman.conf')
486-
local_mirrorlist_conf = Path('/etc/pacman.d/mirrorlist')
487-
488481
mirrorlist_config = mirror_config.mirrorlist_config(speed_sort=True)
489482
pacman_config = mirror_config.pacman_config()
490483

484+
if on_target:
485+
root = self.target
486+
else:
487+
root = Path('/')
488+
491489
if pacman_config:
492490
debug(f'Pacman config: {pacman_config}')
493491

494-
with local_pacman_conf.open('a') as fp:
492+
with open(root / 'etc/pacman.conf', 'a') as fp:
495493
fp.write(pacman_config)
496494

497495
if mirrorlist_config:
498496
debug(f'Mirrorlist: {mirrorlist_config}')
499497

500-
with local_mirrorlist_conf.open('w') as fp:
501-
fp.write(mirrorlist_config)
498+
(root / 'etc/pacman.d/mirrorlist').write_text(mirrorlist_config)
502499

503500
def genfstab(self, flags: str = '-pU') -> None:
504501
fstab_path = self.target / "etc" / "fstab"

0 commit comments

Comments
 (0)