YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Typos

Browse source
This commit is contained in:
Alexandre Aubin 2021-11-01 22:40:52 +01:00
parent 859b3b6f12
commit 3084359155
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/helpers.d/utils
View file

@ -62,7 +62,7 @@ ynh_abort_if_errors() {
} }
# When running an app script with packaging format >= 2, auto-enable ynh_abort_if_errors except for remove script # When running an app script with packaging format >= 2, auto-enable ynh_abort_if_errors except for remove script
if [[ ${YNH_APP_PACKAGING_FORMAT:-0} -ge 2 ]] && [[ ${YNH_APP_ACTION} != "remove" ]] if dpkg --compare-versions ${YNH_APP_PACKAGING_FORMAT:-0} ge 2 && [[ ${YNH_APP_ACTION} != "remove" ]]
then then
ynh_abort_if_errors ynh_abort_if_errors
fi fi

6
src/yunohost/app.py
View file

@ -627,7 +627,7 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False
if upgrade_failed or broke_the_system: if upgrade_failed or broke_the_system:
# display this if there are remaining apps # display this if there are remaining apps
if apps[number + 1 :]: if apps[number + 1:]:
not_upgraded_apps = apps[number:] not_upgraded_apps = apps[number:]
logger.error( logger.error(
m18n.n( m18n.n(
@ -2048,9 +2048,9 @@ def _set_default_ask_questions(questions, script_name="install"):
# Also it in fact doesn't make sense for any of those questions to have an example value nor a default value... # Also it in fact doesn't make sense for any of those questions to have an example value nor a default value...
if question.get("type") in ["domain", "user", "password"]: if question.get("type") in ["domain", "user", "password"]:
if "example" in arg: if "example" in question:
del question["example"] del question["example"]
if "default" in arg: if "default" in question:
del question["domain"] del question["domain"]
return questions return questions