diff --git a/CHANGELOG.md b/CHANGELOG.md index 77497c2e..3bd28750 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

+ - displaying more upgrade substatus ### Fixes - Arch diff --git a/bauh/gems/arch/output.py b/bauh/gems/arch/output.py index d51766ee..e52d3a44 100644 --- a/bauh/gems/arch/output.py +++ b/bauh/gems/arch/output.py @@ -20,11 +20,12 @@ class TransactionStatusHandler(Thread): self.work = True self.logger = logger self.percentage = percentage - self.accepted = {'checking keyring', - 'checking package integrity', - 'loading package files', - 'checking for file conflicts', - 'checking available disk space'} + self.accepted = {'checking keyring': 'keyring', + 'checking package integrity': 'integrity', + 'loading package files': 'loading_files', + 'checking for file conflicts': 'conflicts', + 'checking available disk space': 'disk_space', + ':: Running pre-transaction hooks': 'pre_hooks'} def gen_percentage(self) -> str: if self.percentage: @@ -69,9 +70,9 @@ class TransactionStatusHandler(Thread): else: substatus_found = False lower_output = output.lower() - for msg in self.accepted: + for msg, key in self.accepted.items(): if lower_output.startswith(msg): - self.watcher.change_substatus(self.i18n['arch.substatus.{}'.format(msg)].capitalize()) + self.watcher.change_substatus(self.i18n['arch.substatus.{}'.format(key)].capitalize()) substatus_found = True break diff --git a/bauh/gems/arch/resources/locale/ca b/bauh/gems/arch/resources/locale/ca index 8c69b5ca..abcb4967 100644 --- a/bauh/gems/arch/resources/locale/ca +++ b/bauh/gems/arch/resources/locale/ca @@ -155,11 +155,12 @@ arch.missing_deps.title=Dependències mancants arch.missing_deps_found=Dependències mancants per a {} arch.optdeps.checking=S’estan comprovant les dependències opcionals de {} arch.providers=providers -arch.substatus.checking keyring=Checking keyring -arch.substatus.checking package integrity=Checking packages integrity -arch.substatus.loading package files=Loading package files -arch.substatus.checking for file conflicts=Checking for conflicts -arch.substatus.checking available disk space=Checking available disk space +arch.substatus.conflicts=Checking for conflicts +arch.substatus.disk_space=Checking available disk space +arch.substatus.integrity=Checking packages integrity +arch.substatus.keyring=Checking keyring +arch.substatus.loading_files=Loading package files +arch.substatus.pre_hooks=Running pre-transaction hooks arch.sync_databases.substatus=Synchronizing package databases arch.sync_databases.substatus.error=It was not possible to synchronize the package database arch.task.disk_cache=Organitzen dades dels paquets instal·lats diff --git a/bauh/gems/arch/resources/locale/de b/bauh/gems/arch/resources/locale/de index 22b8e8b0..62d5b28f 100644 --- a/bauh/gems/arch/resources/locale/de +++ b/bauh/gems/arch/resources/locale/de @@ -155,11 +155,12 @@ arch.missing_deps.title=Fehlende Abhängigkeiten arch.missing_deps_found=Fehlende Abhängigkeiten für {} arch.optdeps.checking={} optionale Abhängigkeiten überprüfen arch.providers=providers -arch.substatus.checking keyring=Checking keyring -arch.substatus.checking package integrity=Checking packages integrity -arch.substatus.loading package files=Loading package files -arch.substatus.checking for file conflicts=Checking for conflicts -arch.substatus.checking available disk space=Checking available disk space +arch.substatus.conflicts=Checking for conflicts +arch.substatus.disk_space=Checking available disk space +arch.substatus.integrity=Checking packages integrity +arch.substatus.keyring=Checking keyring +arch.substatus.loading_files=Loading package files +arch.substatus.pre_hooks=Running pre-transaction hooks arch.sync_databases.substatus=Synchronizing package databases arch.sync_databases.substatus.error=It was not possible to synchronize the package database arch.task.disk_cache=Organizing data from installed packages diff --git a/bauh/gems/arch/resources/locale/en b/bauh/gems/arch/resources/locale/en index c483c937..9e9336fb 100644 --- a/bauh/gems/arch/resources/locale/en +++ b/bauh/gems/arch/resources/locale/en @@ -155,11 +155,12 @@ arch.missing_deps.title=Missing dependencies arch.missing_deps_found=Missing dependencies for {} arch.optdeps.checking=Checking {} optional dependencies arch.providers=providers -arch.substatus.checking keyring=Checking keyring -arch.substatus.checking package integrity=Checking packages integrity -arch.substatus.loading package files=Loading package files -arch.substatus.checking for file conflicts=Checking for conflicts -arch.substatus.checking available disk space=Checking available disk space +arch.substatus.conflicts=Checking for conflicts +arch.substatus.disk_space=Checking available disk space +arch.substatus.integrity=Checking packages integrity +arch.substatus.keyring=Checking keyring +arch.substatus.loading_files=Loading package files +arch.substatus.pre_hooks=Running pre-transaction hooks arch.sync_databases.substatus=Synchronizing package databases arch.sync_databases.substatus.error=It was not possible to synchronize the package database arch.task.disk_cache=Organizing data from installed packages diff --git a/bauh/gems/arch/resources/locale/es b/bauh/gems/arch/resources/locale/es index c8850bf7..c496269c 100644 --- a/bauh/gems/arch/resources/locale/es +++ b/bauh/gems/arch/resources/locale/es @@ -155,11 +155,12 @@ arch.missing_deps.title=Dependencias faltantes arch.missing_deps_found=Dependencias faltantes para {} arch.optdeps.checking=Verificando las dependencias opcionales de {} arch.providers=proveedores -arch.substatus.checking keyring=Verificando keyring -arch.substatus.checking package integrity=Verificando la integridad de los paquetes -arch.substatus.loading package files=Cargando archivos de los paquetes -arch.substatus.checking for file conflicts=Verificando conflictos -arch.substatus.checking available disk space=Verificando espacio disponible en disco +arch.substatus.conflicts=Verificando conflictos +arch.substatus.disk_space=Verificando espacio disponible en disco +arch.substatus.integrity=Verificando la integridad de los paquetes +arch.substatus.keyring=Verificando keyring +arch.substatus.loading_files=Cargando archivos de los paquetes +arch.substatus.pre_hooks=Ejecutando ganchos pre-transacción arch.sync_databases.substatus=Sincronizando bases de paquetes arch.sync_databases.substatus.error=No fue posible sincronizar la base de paquetes arch.task.disk_cache=Organizando datos de paquetes instalados diff --git a/bauh/gems/arch/resources/locale/it b/bauh/gems/arch/resources/locale/it index c66e8ac4..13b32ff0 100644 --- a/bauh/gems/arch/resources/locale/it +++ b/bauh/gems/arch/resources/locale/it @@ -155,11 +155,12 @@ arch.missing_deps.title=Dipendenze mancanti arch.missing_deps_found=Dipendenze mancanti per {} arch.optdeps.checking=Verifica di {} dipendenze opzionali arch.providers=providers -arch.substatus.checking keyring=Checking keyring -arch.substatus.checking package integrity=Checking packages integrity -arch.substatus.loading package files=Loading package files -arch.substatus.checking for file conflicts=Checking for conflicts -arch.substatus.checking available disk space=Checking available disk space +arch.substatus.conflicts=Checking for conflicts +arch.substatus.disk_space=Checking available disk space +arch.substatus.integrity=Checking packages integrity +arch.substatus.keyring=Checking keyring +arch.substatus.loading_files=Loading package files +arch.substatus.pre_hooks=Running pre-transaction hooks arch.sync_databases.substatus=Synchronizing package databases arch.sync_databases.substatus.error=It was not possible to synchronize the package database arch.task.disk_cache=Organizzando i dati dai pacchetti installati diff --git a/bauh/gems/arch/resources/locale/pt b/bauh/gems/arch/resources/locale/pt index fbbfc524..072f6db7 100644 --- a/bauh/gems/arch/resources/locale/pt +++ b/bauh/gems/arch/resources/locale/pt @@ -155,11 +155,12 @@ arch.missing_deps.title=Dependências ausentes arch.missing_deps_found=Dependencias ausentes para {} arch.optdeps.checking=Verificando as dependências opcionais de {} arch.providers=provedores -arch.substatus.checking keyring=Verificando o keyring -arch.substatus.checking package integrity=Verificando a integridade dos pacotes -arch.substatus.loading package files=Carregando os arquivos dos pacotes -arch.substatus.checking for file conflicts=Verificando conflitos -arch.substatus.checking available disk space=Verificando espaço disponível em disco +arch.substatus.conflicts=Verificando conflitos +arch.substatus.disk_space=Verificando espaço disponível em disco +arch.substatus.integrity=Verificando a integridade dos pacotes +arch.substatus.keyring=Verificando o keyring +arch.substatus.loading_files=Carregando os arquivos dos pacotes +arch.substatus.pre_hooks=Executando ganchos pré-transação arch.sync_databases.substatus=Sincronizando bases de pacotes arch.sync_databases.substatus.error=Não foi possível sincronizar as bases de pacotes arch.task.disk_cache=Organizando dados dos pacotes instalados diff --git a/bauh/gems/arch/resources/locale/ru b/bauh/gems/arch/resources/locale/ru index 397c8a88..1a1a1a5f 100644 --- a/bauh/gems/arch/resources/locale/ru +++ b/bauh/gems/arch/resources/locale/ru @@ -155,11 +155,12 @@ arch.missing_deps.title=Отсутствующие зависимости arch.missing_deps_found=Отсутствуют зависимости для {} arch.optdeps.checking=Проверка необязательных обязательных зависимостей {} arch.providers=providers -arch.substatus.checking keyring=Checking keyring -arch.substatus.checking package integrity=Checking packages integrity -arch.substatus.loading package files=Loading package files -arch.substatus.checking for file conflicts=Checking for conflicts -arch.substatus.checking available disk space=Checking available disk space +arch.substatus.conflicts=Checking for conflicts +arch.substatus.disk_space=Checking available disk space +arch.substatus.integrity=Checking packages integrity +arch.substatus.keyring=Checking keyring +arch.substatus.loading_files=Loading package files +arch.substatus.pre_hooks=Running pre-transaction hooks arch.sync_databases.substatus=Синхронизация баз данных пакетов arch.sync_databases.substatus.error=Синхронизировать базу данных пакета не удалось arch.task.disk_cache=Organizing data from installed packages diff --git a/bauh/gems/arch/resources/locale/tr b/bauh/gems/arch/resources/locale/tr index f17454aa..e13a8fba 100644 --- a/bauh/gems/arch/resources/locale/tr +++ b/bauh/gems/arch/resources/locale/tr @@ -155,11 +155,12 @@ arch.missing_deps.title=Eksik bağımlılıklar arch.missing_deps_found={} için eksik bağımlılıklar arch.optdeps.checking={} İsteğe bağlı bağımlılıkları kontrol et arch.providers=sağlayıcılar -arch.substatus.checking keyring=Anahtarlık kontrolü -arch.substatus.checking package integrity=Paketlerin bütünlüğünü kontrol et -arch.substatus.loading package files=Paket dosyalarını yükleniyor -arch.substatus.checking for file conflicts=Çakışmalar kontrol ediliyor -arch.substatus.checking available disk space=Kullanılabilir disk alanı kontrol ediliyor +arch.substatus.conflicts=Checking for conflicts +arch.substatus.disk_space=Checking available disk space +arch.substatus.integrity=Checking packages integrity +arch.substatus.keyring=Checking keyring +arch.substatus.loading_files=Loading package files +arch.substatus.pre_hooks=Running pre-transaction hooks arch.sync_databases.substatus=Paket veritabanı eşitleniyor arch.sync_databases.substatus.error=Paket veritabanı eşitlenemedi arch.task.disk_cache=Kurulu paketlerde veri düzenleme