mirror of
https://github.com/spalencsar/bearhub.git
synced 2026-07-07 03:34:15 +02:00
[arch] improvement: always listing repository packages as primary options when multiple providers for a given dependency are available
This commit is contained in:
@@ -9,7 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||||||
### Improvements
|
### Improvements
|
||||||
- Arch
|
- Arch
|
||||||
- not rechecking sub-dependencies of an AUR dependency to be installed
|
- not rechecking sub-dependencies of an AUR dependency to be installed
|
||||||
- allowing AUR packages to be installed as dependencies of a repository package
|
- allowing AUR packages to be installed as dependencies of a repository package
|
||||||
|
- always listing repository packages as primary options when multiple providers for a given dependency are available
|
||||||
|
|
||||||
### Fixes
|
### Fixes
|
||||||
- General
|
- General
|
||||||
|
|||||||
@@ -79,15 +79,22 @@ def request_providers(providers_map: Dict[str, Set[str]], repo_map: Dict[str, st
|
|||||||
for dep, providers in providers_map.items():
|
for dep, providers in providers_map.items():
|
||||||
opts = []
|
opts = []
|
||||||
|
|
||||||
providers_list = [*providers]
|
repo_providers, aur_providers = {}, {}
|
||||||
providers_list.sort()
|
|
||||||
|
|
||||||
for p in providers_list:
|
for p in providers:
|
||||||
repo = repo_map.get(p, 'aur')
|
repo = repo_map.get(p, 'aur')
|
||||||
opts.append(InputOption(label=p,
|
|
||||||
value=p,
|
if repo == 'aur':
|
||||||
icon_path=aur_icon_path if repo == 'aur' else repo_icon_path,
|
aur_providers[p] = repo
|
||||||
tooltip='{}: {}'.format(i18n['repository'].capitalize(), repo)))
|
else:
|
||||||
|
repo_providers[p] = repo
|
||||||
|
|
||||||
|
for current_providers in (repo_providers, aur_providers):
|
||||||
|
for pname, repo in sorted(current_providers.items()):
|
||||||
|
opts.append(InputOption(label=pname,
|
||||||
|
value=pname,
|
||||||
|
icon_path=aur_icon_path if repo == 'aur' else repo_icon_path,
|
||||||
|
tooltip='{}: {}'.format(i18n['repository'].capitalize(), repo)))
|
||||||
|
|
||||||
form.components.append(SingleSelectComponent(label=bold(dep.lower()),
|
form.components.append(SingleSelectComponent(label=bold(dep.lower()),
|
||||||
options=opts,
|
options=opts,
|
||||||
|
|||||||
Reference in New Issue
Block a user