| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/installer.py | 2 | ||||
| -rw-r--r-- | archinstall/lib/pacman/config.py | 23 | ||||
| -rw-r--r-- | archinstall/lib/pacman/repo.py | 1 |
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 2ea728bb..443e2b90 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -661,8 +661,6 @@ class Installer: if testing: info("The testing flag is set. This system will be installed with testing repositories enabled.") pacman_conf.enable(pacman.Repo.Testing) - if multilib: - pacman_conf.enable(pacman.Repo.MultilibTesting) else: info("The testing flag is not set. This system will be installed without testing repositories enabled.") diff --git a/archinstall/lib/pacman/config.py b/archinstall/lib/pacman/config.py index 60d202bc..6686f4a9 100644 --- a/archinstall/lib/pacman/config.py +++ b/archinstall/lib/pacman/config.py @@ -10,24 +10,35 @@ class Config: def __init__(self, target: Path): self.path = Path("/etc") / "pacman.conf" self.chroot_path = target / "etc" / "pacman.conf" - self.patterns: List[re.Pattern] = [] + self.repos: List[Repo] = [] def enable(self, repo: Repo): - self.patterns.append(re.compile(r"^#\s*\[{}\]$".format(repo.value))) + self.repos.append(repo) def apply(self): - if not self.patterns: + if not self.repos: return + + if Repo.Testing in self.repos: + if Repo.Multilib in self.repos: + repos_pattern = f'({Repo.Multilib.value}|.+-{Repo.Testing.value})' + else: + repos_pattern = f'(?!{Repo.Multilib.value}).+-{Repo.Testing.value}' + else: + repos_pattern = Repo.Multilib.value + + pattern = re.compile(rf"^#\s*\[{repos_pattern}\]$") + lines = iter(self.path.read_text().splitlines(keepends=True)) with open(self.path, 'w') as f: for line in lines: - if any(pattern.match(line) for pattern in self.patterns): + if pattern.match(line): # Uncomment this line and the next. f.write(line.lstrip('#')) f.write(next(lines).lstrip('#')) else: f.write(line) - + def persist(self): - if self.patterns: + if self.repos: copy2(self.path, self.chroot_path) diff --git a/archinstall/lib/pacman/repo.py b/archinstall/lib/pacman/repo.py index b4106f97..7a461431 100644 --- a/archinstall/lib/pacman/repo.py +++ b/archinstall/lib/pacman/repo.py @@ -3,4 +3,3 @@ from enum import Enum class Repo(Enum): Multilib = "multilib" Testing = "testing" - MultilibTesting = "multilib-testing" |