Skip to content

Explicitly allow selecting any additional repository #3973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svartkanin wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −18
Open

Explicitly allow selecting any additional repository #3973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions archinstall/lib/mirrors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,14 @@ def select_optional_repositories(preset: list[Repository]) -> list[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]
group = MenuItemGroup(items, sort_items=True)
group = MenuItemGroup(items, sort_items=False)
group.set_selected_by_value(preset)

result = SelectMenu[Repository](
Expand Down
18 changes: 3 additions & 15 deletions archinstall/lib/models/packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,9 @@ class Repository(Enum):
Extra = 'extra'
Multilib = 'multilib'
Testing = 'testing'

def get_repository_list(self) -> list[str]:
match self:
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',
]
MultilibTesting = 'multilib-testing'
CoreTesting = 'core-testing'
ExtraTesting = 'extra-testing'


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/packages/packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def list_available_packages(
"""
packages: dict[str, AvailablePackage] = {}
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:
Pacman.run('-Sy')
Expand Down