Explicitly allow selecting any additional repository (#3973)
Co-authored-by: Daniel Girtler <dgirtler@atlassian.com>
This commit is contained in:
parent
a4ad1b3724
commit
7635474772
|
|
@ -354,9 +354,14 @@ def select_optional_repositories(preset: list[Repository]) -> list[Repository]:
|
||||||
:rtype: Repository
|
:rtype: Repository
|
||||||
"""
|
"""
|
||||||
|
|
||||||
repositories = [Repository.Multilib, Repository.Testing]
|
repositories = [
|
||||||
|
Repository.Multilib,
|
||||||
|
Repository.MultilibTesting,
|
||||||
|
Repository.CoreTesting,
|
||||||
|
Repository.ExtraTesting,
|
||||||
|
]
|
||||||
items = [MenuItem(r.value, value=r) for r in repositories]
|
items = [MenuItem(r.value, value=r) for r in repositories]
|
||||||
group = MenuItemGroup(items, sort_items=True)
|
group = MenuItemGroup(items, sort_items=False)
|
||||||
group.set_selected_by_value(preset)
|
group.set_selected_by_value(preset)
|
||||||
|
|
||||||
result = SelectMenu[Repository](
|
result = SelectMenu[Repository](
|
||||||
|
|
|
||||||
|
|
@ -13,21 +13,9 @@ class Repository(Enum):
|
||||||
Extra = 'extra'
|
Extra = 'extra'
|
||||||
Multilib = 'multilib'
|
Multilib = 'multilib'
|
||||||
Testing = 'testing'
|
Testing = 'testing'
|
||||||
|
MultilibTesting = 'multilib-testing'
|
||||||
def get_repository_list(self) -> list[str]:
|
CoreTesting = 'core-testing'
|
||||||
match self:
|
ExtraTesting = 'extra-testing'
|
||||||
case Repository.Core:
|
|
||||||
return [Repository.Core.value]
|
|
||||||
case Repository.Extra:
|
|
||||||
return [Repository.Extra.value]
|
|
||||||
case Repository.Multilib:
|
|
||||||
return [Repository.Multilib.value]
|
|
||||||
case Repository.Testing:
|
|
||||||
return [
|
|
||||||
'core-testing',
|
|
||||||
'extra-testing',
|
|
||||||
'multilib-testing',
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
|
|
|
||||||
|
|
@ -137,7 +137,7 @@ def list_available_packages(
|
||||||
"""
|
"""
|
||||||
packages: dict[str, AvailablePackage] = {}
|
packages: dict[str, AvailablePackage] = {}
|
||||||
current_package: list[str] = []
|
current_package: list[str] = []
|
||||||
filtered_repos = [name for repo in repositories for name in repo.get_repository_list()]
|
filtered_repos = [repo.value for repo in repositories]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
Pacman.run('-Sy')
|
Pacman.run('-Sy')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue