mirror of
https://github.com/spalencsar/bearhub.git
synced 2026-07-07 03:34:15 +02:00
[fix][aur] replaces the wrong term 'mirror' by 'repository'
This commit is contained in:
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||
### Fixes
|
||||
- AUR:
|
||||
- not finding some dependencies declared as files instead of the package names (e.g: dolphin-emu-git )
|
||||
- replaces the wrong term **mirror** by **repository**
|
||||
|
||||
|
||||
## [0.7.3] 2019-11-29
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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'],
|
||||
|
||||
@@ -200,4 +200,5 @@ close=tanca
|
||||
publisher.verified=verificat
|
||||
mirror=mirall
|
||||
emulator=emulador
|
||||
do_not.install=no instal·leu
|
||||
do_not.install=no instal·leu
|
||||
repository=dipòsit
|
||||
@@ -154,4 +154,5 @@ stable=Stabil
|
||||
close=Schließen
|
||||
publisher.verified=Verifiziert
|
||||
emulator=emulator
|
||||
do_not.install=nicht installieren
|
||||
do_not.install=nicht installieren
|
||||
repository=repository
|
||||
@@ -156,3 +156,4 @@ publisher.verified=verified
|
||||
mirror=mirror
|
||||
emulator=emulator
|
||||
do_not.install=don't install
|
||||
repository=repository
|
||||
|
||||
@@ -199,4 +199,5 @@ close=cerrar
|
||||
publisher.verified=verificado
|
||||
mirror=espejo
|
||||
emulator=emulador
|
||||
do_not.install=no instalar
|
||||
do_not.install=no instalar
|
||||
repository=repositorio
|
||||
@@ -155,4 +155,5 @@ close=vicino
|
||||
publisher.verified=verificato
|
||||
mirror=specchio
|
||||
emulator=emulatore
|
||||
do_not.install=non installare
|
||||
do_not.install=non installare
|
||||
repository=deposito
|
||||
@@ -202,4 +202,5 @@ close=fechar
|
||||
publisher.verified=verificado
|
||||
mirror=espelho
|
||||
emulator=emulador
|
||||
do_not.install=não instalar
|
||||
do_not.install=não instalar
|
||||
repository=repositório
|
||||
Reference in New Issue
Block a user