spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-09 15:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

arch: improving error messages

Browse Source
This commit is contained in:
Vinicius Moreira
2019-09-20 19:44:12 -03:00
parent 0d2770296c
commit 0085f40cdf
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bauh/gems/arch/confirmation.py
View File

@@ -7,9 +7,10 @@ from bauh.commons.html import bold
def request_optional_deps(pkgname: str, pkg_mirrors: dict, watcher: ProcessWatcher, i18n: dict) -> Set[str]: def request_optional_deps(pkgname: str, pkg_mirrors: dict, watcher: ProcessWatcher, i18n: dict) -> Set[str]:
opts = [InputOption('{}{} ( {} )'.format(p, ': ' + d['desc'] if d['desc'] else '', d['mirror'].upper()), p) for p, d in pkg_mirrors.items()]
view_opts = MultipleSelectComponent(label='', view_opts = MultipleSelectComponent(label='',
options=[InputOption('{}{} ( {} )'.format(p, ': ' + d['desc'] if d['desc'] else '', d['mirror'].upper()), p) options=opts,
for p, d in pkg_mirrors.items()]) default_options=set(opts))
install = watcher.request_confirmation(title=i18n['arch.install.optdeps.request.title'], install = watcher.request_confirmation(title=i18n['arch.install.optdeps.request.title'],
body='<p>{}</p>'.format(i18n['arch.install.optdeps.request.body'].format(bold(pkgname)) + ':'), body='<p>{}</p>'.format(i18n['arch.install.optdeps.request.body'].format(bold(pkgname)) + ':'),
components=[view_opts], components=[view_opts],

1
bauh/gems/arch/controller.py
View File

@@ -381,7 +381,6 @@ class ArchManager(SoftwareManager):
check_res = makepkg.check_missing_deps(pkgdir, handler.watcher) check_res = makepkg.check_missing_deps(pkgdir, handler.watcher)
if check_res: if check_res:
if check_res.get('gpg_key'): if check_res.get('gpg_key'):
if handler.watcher.request_confirmation(title=self.i18n['arch.aur.install.unknown_key.title'], if handler.watcher.request_confirmation(title=self.i18n['arch.aur.install.unknown_key.title'],
body=self.i18n['arch.install.aur.unknown_key.body'].format(bold(pkgname), bold(check_res['gpg_key']))): body=self.i18n['arch.install.aur.unknown_key.body'].format(bold(pkgname), bold(check_res['gpg_key']))):

7
bauh/gems/arch/message.py
View File

@@ -1,20 +1,21 @@
from bauh.api.abstract.handler import ProcessWatcher from bauh.api.abstract.handler import ProcessWatcher
from bauh.api.abstract.view import MessageType from bauh.api.abstract.view import MessageType
from bauh.commons.html import bold
def show_dep_not_installed(watcher: ProcessWatcher, pkgname: str, depname: str, i18n: dict): def show_dep_not_installed(watcher: ProcessWatcher, pkgname: str, depname: str, i18n: dict):
watcher.show_message(title=i18n['error'], watcher.show_message(title=i18n['error'],
body=i18n['arch.install.dependency.install.error'].format('"{}"'.format(depname), '"{}"'.format(pkgname)), body=i18n['arch.install.dependency.install.error'].format(bold(depname), bold(pkgname)),
type_=MessageType.ERROR) type_=MessageType.ERROR)
def show_dep_not_found(depname: str, i18n: dict, watcher: ProcessWatcher): def show_dep_not_found(depname: str, i18n: dict, watcher: ProcessWatcher):
watcher.show_message(title=i18n['arch.install.dep_not_found.title'], watcher.show_message(title=i18n['arch.install.dep_not_found.title'],
body=i18n['arch.install.dep_not_found.body'].format('"{}"'.format(depname)), body=i18n['arch.install.dep_not_found.body'].format(bold(depname)),
type_=MessageType.ERROR) type_=MessageType.ERROR)
def show_optdep_not_installed(depname: str, watcher: ProcessWatcher, i18n: dict): def show_optdep_not_installed(depname: str, watcher: ProcessWatcher, i18n: dict):
watcher.show_message(title=i18n['error'], watcher.show_message(title=i18n['error'],
body=i18n['arch.install.optdep.error'].format('"{}"'.format(depname)), body=i18n['arch.install.optdep.error'].format(bold(depname)),
type_=MessageType.ERROR) type_=MessageType.ERROR)