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

[fix][aur] replaces the wrong term 'mirror' by 'repository'

Browse Source
This commit is contained in:
Vinicius Moreira
2019-12-02 18:02:07 -03:00
parent 5acd06a708
commit 2aec03586a
9 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ def request_optional_deps(pkgname: str, pkg_mirrors: dict, watcher: ProcessWatch
opts = []
for p, d in pkg_mirrors.items():
op = InputOption('{}{} ( {}: {} )'.format(p, ': ' + d['desc'] if d['desc'] else '', i18n['mirror'], d['mirror'].upper()), p)
op = InputOption('{}{} ( {}: {} )'.format(p, ': ' + d['desc'] if d['desc'] else '', i18n['repository'], d['mirror'].upper()), p)
op.icon_path = _get_mirror_icon(d['mirror'])
opts.append(op)
@@ -39,7 +39,7 @@ def request_install_missing_deps(pkgname: str, pkg_mirrors: dict, watcher: Proce
opts = []
for p, m in pkg_mirrors.items():
op = InputOption('{} ( {}: {} )'.format(p, i18n['mirror'], m.upper()), p)
op = InputOption('{} ( {}: {} )'.format(p, i18n['repository'], m.upper()), p)
op.read_only = True
op.icon_path = _get_mirror_icon(m)
opts.append(op)

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

@@ -428,7 +428,7 @@ class ArchManager(SoftwareManager):
self._pre_download_source(pkgname, project_dir, handler.watcher)
self._update_progress(handler.watcher, 50, change_progress)
if not self._install_missings_deps_and_keys(pkgname, root_password, handler, project_dir):
if not self._check_deps(pkgname, root_password, handler, project_dir):
return False
# building main package
@@ -458,7 +458,7 @@ class ArchManager(SoftwareManager):
return False
def _install_missings_deps_and_keys(self, pkgname: str, root_password: str, handler: ProcessHandler, pkgdir: str) -> bool:
def _check_deps(self, pkgname: str, root_password: str, handler: ProcessHandler, pkgdir: str) -> bool:
handler.watcher.change_substatus(self.i18n['arch.checking.deps'].format(bold(pkgname)))
check_res = makepkg.check(pkgdir, handler)
@@ -486,7 +486,7 @@ class ArchManager(SoftwareManager):
return False
# it is necessary to re-check because missing PGP keys are only notified when there are none missing
return self._install_missings_deps_and_keys(pkgname, root_password, handler, pkgdir)
return self._check_deps(pkgname, root_password, handler, pkgdir)
if check_res.get('gpg_key'):
if handler.watcher.request_confirmation(title=self.i18n['arch.aur.install.unknown_key.title'],