From 3084359155bf29c3cb69cc654cac0d19876e109f Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 1 Nov 2021 22:40:52 +0100
Subject: [PATCH] Typos

---
 data/helpers.d/utils | 2 +-
 src/yunohost/app.py  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index 57d5de56a..02fd10ba9 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -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
-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
     ynh_abort_if_errors
 fi
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 7488a1646..ba4351c2f 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -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:
 
                 # display this if there are remaining apps
-                if apps[number + 1 :]:
+                if apps[number + 1:]:
                     not_upgraded_apps = apps[number:]
                     logger.error(
                         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...
             if question.get("type") in ["domain", "user", "password"]:
-                if "example" in arg:
+                if "example" in question:
                     del question["example"]
-                if "default" in arg:
+                if "default" in question:
                     del question["domain"]
 
     return questions