From 9af308dd9369fb3ea3c18b49988a8352976c0952 Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 17 Aug 2021 17:23:27 +0200 Subject: [PATCH 1/8] [fix] Avoid warning and use safeloader --- moulinette/actionsmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moulinette/actionsmap.py b/moulinette/actionsmap.py index 6b162868..fd10ef23 100644 --- a/moulinette/actionsmap.py +++ b/moulinette/actionsmap.py @@ -384,7 +384,7 @@ class ExtraArgumentParser(object): def ordered_yaml_load(stream): - class OrderedLoader(yaml.Loader): + class OrderedLoader(yaml.SafeLoader): pass OrderedLoader.add_constructor( From e9f3ec2a3d3a9c9e8ee33a5dab7339158db42a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= Date: Thu, 3 Jun 2021 16:39:53 +0000 Subject: [PATCH 2/8] Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: YunoHost/moulinette Translate-URL: https://translate.yunohost.org/projects/yunohost/moulinette/fr/ --- locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/fr.json b/locales/fr.json index 9eb5edb1..c6f9371f 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -4,7 +4,7 @@ "authentication_required": "Authentification requise", "authentication_required_long": "L’authentification est requise pour exécuter cette action", "colon": "{} : ", - "confirm": "Confirmez : {prompt}", + "confirm": "Confirmez {prompt}", "deprecated_command": "'{prog} {command}' est déprécié et sera bientôt supprimé", "deprecated_command_alias": "'{prog} {old}' est déprécié et sera bientôt supprimé, utilisez '{prog} {new}' à la place", "error": "Erreur :", From 27673790b718ebdcf44db5f719850ebcc219e158 Mon Sep 17 00:00:00 2001 From: amirale qt Date: Fri, 18 Jun 2021 09:18:17 +0000 Subject: [PATCH 3/8] Translated using Weblate (Esperanto) Currently translated at 100.0% (56 of 56 strings) Translation: YunoHost/moulinette Translate-URL: https://translate.yunohost.org/projects/yunohost/moulinette/eo/ --- locales/eo.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/locales/eo.json b/locales/eo.json index 2d45a9da..c37acb27 100644 --- a/locales/eo.json +++ b/locales/eo.json @@ -1,7 +1,7 @@ { "password": "Pasvorto", "colon": "{}: ", - "warn_the_user_that_lock_is_acquired": "la alia komando ĵus kompletigis, nun komencante ĉi tiun komandon", + "warn_the_user_that_lock_is_acquired": "La alia komando ĵus kompletigis, nun komencante ĉi tiun komandon", "warn_the_user_about_waiting_lock_again": "Ankoraŭ atendanta...", "warn_the_user_about_waiting_lock": "Alia komando de YunoHost funkcias ĝuste nun, ni atendas, ke ĝi finiĝos antaŭ ol funkcii ĉi tiu", "command_unknown": "Komando '{command:s}' nekonata?", @@ -9,13 +9,13 @@ "download_unknown_error": "Eraro dum elŝutado de datumoj de {url:s}: {error:s}", "download_timeout": "{url:s} prenis tro da tempo por respondi, rezignis.", "download_ssl_error": "SSL-eraro dum konekto al {url:s}", - "invalid_url": "Nevalida url {url:s} (ĉu ĉi tiu retejo ekzistas?)", + "invalid_url": "Nevalida URL{url:s} (ĉu ĉi tiu retejo ekzistas?)", "error_changing_file_permissions": "Eraro dum ŝanĝo de permesoj por {path:s}: {error:s}", "error_removing": "Eraro dum la forigo de {path:s}: {error:s}", "error_writing_file": "Eraro skribinte dosieron {file:s}: {error:s}", - "corrupted_toml": "Korupta toml legita el {ressource:s} (kialo: {error:s})", - "corrupted_yaml": "Korupta yaml legita de {ressource:s} (kialo: {error:s})", - "corrupted_json": "Koruptita json legita de {ressource:s} (kialo: {error:s})", + "corrupted_toml": "Korupta TOML legita el {ressource:s} (kialo: {error:s})", + "corrupted_yaml": "Korupta YAML legita de {ressource:s} (kialo: {error:s})", + "corrupted_json": "Koruptita JSON legis de {ressource:s} (Kialo: {error:s})", "unknown_error_reading_file": "Nekonata eraro dum provi legi dosieron {file:s} (kialo: {error:s})", "cannot_write_file": "Ne povis skribi dosieron {file:s} (kialo: {error:s})", "cannot_open_file": "Ne povis malfermi dosieron {file: s} (kialo: {error: s})", @@ -54,5 +54,7 @@ "authentication_profile_required": "Aŭtentigo al la profilo '{profile}' bezonata", "argument_required": "Argumento '{argument}' estas bezonata", "logged_out": "Ensalutinta", - "invalid_token": "Nevalida tokeno - bonvolu autentiki" + "invalid_token": "Nevalida tokeno - bonvolu autentiki", + "ldap_server_is_down_restart_it": "La LDAP-servo malpliiĝas, provu rekomenci ĝin...", + "session_expired": "La sesio eksvalidiĝis. Bonvolu re-aŭtentikigi." } From 66e21e7ac9f3d3a45438752d4ec90dfa5bccb0f6 Mon Sep 17 00:00:00 2001 From: Christian Wehrli Date: Fri, 9 Jul 2021 21:10:18 +0000 Subject: [PATCH 4/8] Translated using Weblate (German) Currently translated at 100.0% (56 of 56 strings) Translation: YunoHost/moulinette Translate-URL: https://translate.yunohost.org/projects/yunohost/moulinette/de/ --- locales/de.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locales/de.json b/locales/de.json index 6062fabe..0d2e2340 100644 --- a/locales/de.json +++ b/locales/de.json @@ -29,9 +29,9 @@ "success": "Erfolg!", "unable_authenticate": "Anmelden fehlgeschlagen", "unable_retrieve_session": "Sitzung konnte nicht abgerufen werden. Grund: '{exception}'", - "values_mismatch": "Die Werte passen nicht", + "values_mismatch": "Die Werte passen nicht zusammen", "warning": "Warnung:", - "websocket_request_expected": "Eine WebSocket Anfrage wurde erwartet", + "websocket_request_expected": "Eine WebSocket-Anfrage wurde erwartet", "deprecated_command": "'{prog} {command}' ist veraltet und wird bald entfernt werden", "deprecated_command_alias": "'{prog} {old}' ist veraltet und wird bald entfernt werden, benutze '{prog} {new}' stattdessen", "unknown_group": "Gruppe '{group}' ist unbekannt", @@ -41,7 +41,7 @@ "corrupted_json": "Beschädigtes JSON gelesen von {ressource:s} (reason: {error:s})", "unknown_error_reading_file": "Unbekannter Fehler beim Lesen der Datei {file:s} (reason: {error:s})", "cannot_write_file": "Kann Datei {file:s} nicht schreiben (reason: {error:s})", - "cannot_open_file": "Kann Datei {file:s} nicht öffnen (reason: {error:s})", + "cannot_open_file": "Datei {file:s} konnte nicht geöffnet werden (Ursache: {error:s})", "corrupted_yaml": "Beschädigtes YAML gelesen von {ressource:s} (reason: {error:s})", "warn_the_user_that_lock_is_acquired": "Der andere Befehl wurde gerade abgeschlossen, starte jetzt diesen Befehl", "warn_the_user_about_waiting_lock_again": "Immer noch wartend...", @@ -57,5 +57,5 @@ "error_writing_file": "Fehler beim Schreiben von Datei {file:s}: {error:s}", "corrupted_toml": "Beschädigtes TOML gelesen von {ressource:s} (reason: {error:s})", "ldap_server_is_down_restart_it": "Der LDAP-Dienst wurde angehalten. Es wird versucht, ihn erneut zu starten...", - "session_expired": "Die Sitzung ist abgelaufen. Bitte neuauthentifizieren." + "session_expired": "Die Sitzung ist abgelaufen. Bitte authentifizieren Sie sich neu ." } From ca3295f1d6c5a435024976ac73d8bb4327a4d09f Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 28 Jul 2021 22:24:04 +0000 Subject: [PATCH 5/8] Added translation using Weblate (Ukrainian) --- locales/uk.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 locales/uk.json diff --git a/locales/uk.json b/locales/uk.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/locales/uk.json @@ -0,0 +1 @@ +{} From e6a303a4cb440307618a35326b3d0921e5f368ae Mon Sep 17 00:00:00 2001 From: mifegui Date: Mon, 9 Aug 2021 21:51:57 +0000 Subject: [PATCH 6/8] Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: YunoHost/moulinette Translate-URL: https://translate.yunohost.org/projects/yunohost/moulinette/pt/ --- locales/pt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/pt.json b/locales/pt.json index e0081b9b..2e9ac580 100644 --- a/locales/pt.json +++ b/locales/pt.json @@ -1,5 +1,5 @@ { - "argument_required": "O argumento {argument} é obrigatório", + "argument_required": "O argumento '{argument}' é obrigatório", "authentication_profile_required": "Autenticação requerida para o perfil '{profile}'", "authentication_required": "Autenticação obrigatória", "authentication_required_long": "É preciso autenticar-se para realizar esta ação", From 2a89a826608395134a15edc8d094b0267cc5f21c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 19 Aug 2021 18:14:52 +0200 Subject: [PATCH 7/8] Add warning when trying to feed non-string values to Popen env --- moulinette/utils/process.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moulinette/utils/process.py b/moulinette/utils/process.py index b8d5b915..32d220c8 100644 --- a/moulinette/utils/process.py +++ b/moulinette/utils/process.py @@ -2,6 +2,7 @@ import subprocess import os import threading import queue +import logging # This import is unused in this file. It will be deleted in future (W0611 PEP8), # but for the momment we keep it due to yunohost moulinette script that used @@ -12,7 +13,7 @@ quote # This line is here to avoid W0611 PEP8 error (see comments above) # Prevent to import subprocess only for common classes CalledProcessError = subprocess.CalledProcessError - +logger = logging.getLogger("moulinette.utils.process") # Alternative subprocess methods --------------------------------------- @@ -70,6 +71,9 @@ def call_async_output(args, callback, **kwargs): kwargs["env"] = os.environ kwargs["env"]["YNH_STDINFO"] = str(stdinfo.fdWrite) + if "env" in kwargs and not all(isinstance(v, str) for v in kwargs["env"].values()): + logger.warning("While trying to call call_async_output: env contained non-string values, probably gonna cause issue in Popen(...)") + try: p = subprocess.Popen(args, **kwargs) From 00123f900c74fe12586f609a8c022129fc9c58bf Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 19 Aug 2021 19:26:43 +0200 Subject: [PATCH 8/8] Update changelog for 4.2.4 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index a929320d..4b086b85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +moulinette (4.2.4) stable; urgency=low + + - [fix] Avoid warning and use safeloader ([#281](https://github.com/YunoHost/moulinette/pull/281)) + - [fix] Add warning when trying to feed non-string values to Popen env (2a89a82) + - [i18n] Translations updated for Esperanto, French, German, Portuguese + + Thanks to all contributors <3 ! (amirale qt, Christian Wehrli, Éric Gaspar, ljf, mifegui) + + -- Alexandre Aubin Thu, 19 Aug 2021 19:25:30 +0200 + moulinette (4.2.3.3) stable; urgency=low - [fix] Damn array args bug (2c9ec9f6)