Skip to content

Commit 7635474

Browse files
svartkanindgirtler
andauthored
Explicitly allow selecting any additional repository (#3973)
Co-authored-by: Daniel Girtler <dgirtler@atlassian.com>
1 parent a4ad1b3 commit 7635474

3 files changed

Lines changed: 11 additions & 18 deletions

File tree

archinstall/lib/mirrors.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,14 @@ def select_optional_repositories(preset: list[Repository]) -> list[Repository]:
354354
:rtype: Repository
355355
"""
356356

357-
repositories = [Repository.Multilib, Repository.Testing]
357+
repositories = [
358+
Repository.Multilib,
359+
Repository.MultilibTesting,
360+
Repository.CoreTesting,
361+
Repository.ExtraTesting,
362+
]
358363
items = [MenuItem(r.value, value=r) for r in repositories]
359-
group = MenuItemGroup(items, sort_items=True)
364+
group = MenuItemGroup(items, sort_items=False)
360365
group.set_selected_by_value(preset)
361366

362367
result = SelectMenu[Repository](

archinstall/lib/models/packages.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,9 @@ class Repository(Enum):
1313
Extra = 'extra'
1414
Multilib = 'multilib'
1515
Testing = 'testing'
16-
17-
def get_repository_list(self) -> list[str]:
18-
match self:
19-
case Repository.Core:
20-
return [Repository.Core.value]
21-
case Repository.Extra:
22-
return [Repository.Extra.value]
23-
case Repository.Multilib:
24-
return [Repository.Multilib.value]
25-
case Repository.Testing:
26-
return [
27-
'core-testing',
28-
'extra-testing',
29-
'multilib-testing',
30-
]
16+
MultilibTesting = 'multilib-testing'
17+
CoreTesting = 'core-testing'
18+
ExtraTesting = 'extra-testing'
3119

3220

3321
@dataclass

archinstall/lib/packages/packages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def list_available_packages(
137137
"""
138138
packages: dict[str, AvailablePackage] = {}
139139
current_package: list[str] = []
140-
filtered_repos = [name for repo in repositories for name in repo.get_repository_list()]
140+
filtered_repos = [repo.value for repo in repositories]
141141

142142
try:
143143
Pacman.run('-Sy')

0 commit comments

Comments
 (0)