From 2aec03586a81e3b03bb499589c8d649f063baec1 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 2 Dec 2019 18:02:07 -0300 Subject: [PATCH] [fix][aur] replaces the wrong term 'mirror' by 'repository' --- CHANGELOG.md | 1 + bauh/gems/arch/confirmation.py | 4 ++-- bauh/gems/arch/controller.py | 6 +++--- bauh/view/resources/locale/ca | 3 ++- bauh/view/resources/locale/de | 3 ++- bauh/view/resources/locale/en | 1 + bauh/view/resources/locale/es | 3 ++- bauh/view/resources/locale/it | 3 ++- bauh/view/resources/locale/pt | 3 ++- 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11c22971..04de7d18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/bauh/gems/arch/confirmation.py b/bauh/gems/arch/confirmation.py index 8b3e29de..15838e93 100644 --- a/bauh/gems/arch/confirmation.py +++ b/bauh/gems/arch/confirmation.py @@ -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) diff --git a/bauh/gems/arch/controller.py b/bauh/gems/arch/controller.py index 445a2c47..0612fc57 100644 --- a/bauh/gems/arch/controller.py +++ b/bauh/gems/arch/controller.py @@ -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'], diff --git a/bauh/view/resources/locale/ca b/bauh/view/resources/locale/ca index f080866b..6f557128 100644 --- a/bauh/view/resources/locale/ca +++ b/bauh/view/resources/locale/ca @@ -200,4 +200,5 @@ close=tanca publisher.verified=verificat mirror=mirall emulator=emulador -do_not.install=no instal·leu \ No newline at end of file +do_not.install=no instal·leu +repository=dipòsit \ No newline at end of file diff --git a/bauh/view/resources/locale/de b/bauh/view/resources/locale/de index a7b7f02f..06f1a45f 100644 --- a/bauh/view/resources/locale/de +++ b/bauh/view/resources/locale/de @@ -154,4 +154,5 @@ stable=Stabil close=Schließen publisher.verified=Verifiziert emulator=emulator -do_not.install=nicht installieren \ No newline at end of file +do_not.install=nicht installieren +repository=repository \ No newline at end of file diff --git a/bauh/view/resources/locale/en b/bauh/view/resources/locale/en index ab040dae..72a26c48 100644 --- a/bauh/view/resources/locale/en +++ b/bauh/view/resources/locale/en @@ -156,3 +156,4 @@ publisher.verified=verified mirror=mirror emulator=emulator do_not.install=don't install +repository=repository diff --git a/bauh/view/resources/locale/es b/bauh/view/resources/locale/es index 8be80d9a..c3324dc0 100644 --- a/bauh/view/resources/locale/es +++ b/bauh/view/resources/locale/es @@ -199,4 +199,5 @@ close=cerrar publisher.verified=verificado mirror=espejo emulator=emulador -do_not.install=no instalar \ No newline at end of file +do_not.install=no instalar +repository=repositorio \ No newline at end of file diff --git a/bauh/view/resources/locale/it b/bauh/view/resources/locale/it index 666f8f2c..8a3043e6 100644 --- a/bauh/view/resources/locale/it +++ b/bauh/view/resources/locale/it @@ -155,4 +155,5 @@ close=vicino publisher.verified=verificato mirror=specchio emulator=emulatore -do_not.install=non installare \ No newline at end of file +do_not.install=non installare +repository=deposito \ No newline at end of file diff --git a/bauh/view/resources/locale/pt b/bauh/view/resources/locale/pt index 71890dff..7a3afc7f 100644 --- a/bauh/view/resources/locale/pt +++ b/bauh/view/resources/locale/pt @@ -202,4 +202,5 @@ close=fechar publisher.verified=verificado mirror=espelho emulator=emulador -do_not.install=não instalar \ No newline at end of file +do_not.install=não instalar +repository=repositório \ No newline at end of file