From 6b285bae88bc043e682e78c07cceb6c55345c61c Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Tue, 30 Jul 2019 01:18:14 +0200 Subject: [PATCH 1/3] [mod] remove silent exception in toos_update --- locales/en.json | 1 + src/yunohost/tools.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/en.json b/locales/en.json index b792081a2..1c56e46d3 100644 --- a/locales/en.json +++ b/locales/en.json @@ -539,6 +539,7 @@ "system_upgraded": "The system has been upgraded", "system_username_exists": "Username already exists in the system users", "this_action_broke_dpkg": "This action broke dpkg/apt (the system package managers)... You can try to solve this issue by connecting through SSH and running `sudo dpkg --configure -a`.", + "tools_update_failed_to_app_fetchlit": "Failed to update YunoHost's apps because: {error}", "tools_upgrade_at_least_one": "Please specify --apps OR --system", "tools_upgrade_cant_both": "Cannot upgrade both system and apps at the same time", "tools_upgrade_cant_hold_critical_packages": "Unable to hold critical packages ...", diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index c00a5cb41..7a0075387 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -520,9 +520,8 @@ def tools_update(apps=False, system=False): logger.info(m18n.n('updating_app_lists')) try: app_fetchlist() - except YunohostError: - # FIXME : silent exception !? - pass + except YunohostError as e: + logger.error('tools_update_failed_to_app_fetchlit', error=e) upgradable_apps = list(_list_upgradable_apps()) From 3132d35df63077a10326c00af95ff6e1649504d5 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 30 Jul 2019 01:22:31 +0200 Subject: [PATCH 2/3] Typos --- locales/en.json | 2 +- src/yunohost/tools.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en.json b/locales/en.json index 1c56e46d3..fdb5d4f48 100644 --- a/locales/en.json +++ b/locales/en.json @@ -539,7 +539,7 @@ "system_upgraded": "The system has been upgraded", "system_username_exists": "Username already exists in the system users", "this_action_broke_dpkg": "This action broke dpkg/apt (the system package managers)... You can try to solve this issue by connecting through SSH and running `sudo dpkg --configure -a`.", - "tools_update_failed_to_app_fetchlit": "Failed to update YunoHost's apps because: {error}", + "tools_update_failed_to_app_fetchlist": "Failed to update YunoHost's apps because: {error}", "tools_upgrade_at_least_one": "Please specify --apps OR --system", "tools_upgrade_cant_both": "Cannot upgrade both system and apps at the same time", "tools_upgrade_cant_hold_critical_packages": "Unable to hold critical packages ...", diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index 7a0075387..5e14082b5 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -521,7 +521,7 @@ def tools_update(apps=False, system=False): try: app_fetchlist() except YunohostError as e: - logger.error('tools_update_failed_to_app_fetchlit', error=e) + logger.error(m18n.n('tools_update_failed_to_app_fetchlist'), error=e) upgradable_apps = list(_list_upgradable_apps()) From 6a4fb9b42324e3928457e5ac88d3d4529fbaa4b6 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 4 Aug 2019 17:58:24 +0200 Subject: [PATCH 3/3] s/apps/applists/ --- locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.json b/locales/en.json index fdb5d4f48..0a4619ba9 100644 --- a/locales/en.json +++ b/locales/en.json @@ -539,7 +539,7 @@ "system_upgraded": "The system has been upgraded", "system_username_exists": "Username already exists in the system users", "this_action_broke_dpkg": "This action broke dpkg/apt (the system package managers)... You can try to solve this issue by connecting through SSH and running `sudo dpkg --configure -a`.", - "tools_update_failed_to_app_fetchlist": "Failed to update YunoHost's apps because: {error}", + "tools_update_failed_to_app_fetchlist": "Failed to update YunoHost's applists because: {error}", "tools_upgrade_at_least_one": "Please specify --apps OR --system", "tools_upgrade_cant_both": "Cannot upgrade both system and apps at the same time", "tools_upgrade_cant_hold_critical_packages": "Unable to hold critical packages ...",