From ebb492fd1e61b8ed4a3fa39ab51b905af30ff399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 30 Dec 2019 14:43:10 +0100
Subject: [PATCH 01/29] Add force option in upgrade script

---
 data/actionsmap/yunohost.yml | 4 ++++
 src/yunohost/app.py          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml
index 3a4c9db97..af9b6b2e3 100644
--- a/data/actionsmap/yunohost.yml
+++ b/data/actionsmap/yunohost.yml
@@ -640,6 +640,10 @@ app:
                 -f:
                     full: --file
                     help: Folder or tarball for upgrade
+                -F:
+                    full: --force
+                    help: Force the update, even though the app is up to date
+                    action: store_true
 
         ### app_change_url()
         change-url:
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 30d3ab31b..76de6d86b 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -410,7 +410,7 @@ def app_change_url(operation_logger, app, domain, path):
     hook_callback('post_app_change_url', args=args_list, env=env_dict)
 
 
-def app_upgrade(app=[], url=None, file=None):
+def app_upgrade(app=[], url=None, file=None, force=False):
     """
     Upgrade app
 

From ead80c72f8d136d8f178137b19c9dbfbb57de39b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 30 Dec 2019 14:43:48 +0100
Subject: [PATCH 02/29] Implement upgrade type management and avoid unusefull
 upgrade

---
 src/yunohost/app.py | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 76de6d86b..97a3857a8 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -459,12 +459,39 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         elif app_dict["upgradable"] == "url_required":
             logger.warning(m18n.n('custom_app_url_required', app=app_instance_name))
             continue
-        elif app_dict["upgradable"] == "yes":
+        elif app_dict["upgradable"] == "yes" or force:
             manifest, extracted_app_folder = _fetch_app_from_git(app_instance_name)
         else:
             logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
             continue
 
+        # Manage upgrade type and avoid any upgrade if there are nothing to do
+        upgrade_type = "UNKNOWN"
+        if manifest.get("upgrade_only_if_version_changes", None) is True:
+            # Get actual_version and new version
+            app_actual_version = manifest["version"]
+            app_new_version = app_dict["version"]
+
+            # do only the upgrade if there are a change
+            if app_actual_version == app_new_version and not force:
+                logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
+                # Save update time
+                now = int(time.time())
+                app_setting(app_instance_name, 'update_time', now)
+                app_setting(app_instance_name, 'current_revision', manifest.get('remote', {}).get('revision', "?"))
+                continue
+            elif app_actual_version == app_new_version:
+                upgrade_type = "UPGRADE_FORCED"
+            elif "~ynh" in app_actual_version and "~ynh" in app_new_version:
+                app_actual_version_upstream, app_actual_version_pkg = app_actual_version.split("~ynh")
+                app_new_version_upstream, app_new_version_pkg = app_new_version.split("~ynh")
+                if app_actual_version_upstream == app_new_version_upstream:
+                    upgrade_type = "UPGRADE_PACKAGE"
+                elif app_actual_version_pkg == app_new_version_pkg:
+                    upgrade_type = "UPGRADE_APP"
+                else:
+                    upgrade_type = "UPGRADE_FULL"
+
         # Check requirements
         _check_manifest_requirements(manifest, app_instance_name=app_instance_name)
         _assert_system_is_sane_for_app(manifest, "pre")
@@ -483,6 +510,7 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         env_dict["YNH_APP_ID"] = app_id
         env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
         env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
+        env_dict["YNH_APP_UPGRADE_TYPE"] = upgrade_type
 
         # Start register change on system
         related_to = [('app', app_instance_name)]

From 58cce48195e8711a3dd9ae7a22772dd5793b8307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Sat, 11 Apr 2020 22:52:42 +0200
Subject: [PATCH 03/29] Export old and new version in environnement

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

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index d449f0c39..9ea9294bc 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -405,8 +405,7 @@ ynh_app_upstream_version () {
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
 
-    manifest="${manifest:-../manifest.json}"
-    version_key=$(ynh_read_manifest --manifest="$manifest" --manifest_key="version")
+    version_key=$YNH_APP_MANIFEST_VERSION
     echo "${version_key/~ynh*/}"
 }
 
@@ -429,8 +428,7 @@ ynh_app_package_version () {
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
 
-    manifest="${manifest:-../manifest.json}"
-    version_key=$(ynh_read_manifest --manifest="$manifest" --manifest_key="version")
+    version_key=$YNH_APP_MANIFEST_VERSION
     echo "${version_key/*~ynh/}"
 }
 
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 97a3857a8..d380235bf 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -347,6 +347,7 @@ def app_change_url(operation_logger, app, domain, path):
     env_dict["YNH_APP_ID"] = app_id
     env_dict["YNH_APP_INSTANCE_NAME"] = app
     env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
+    env_dict["YNH_APP_MANIFEST_VERSION"] = manifest.get("version", "?")
 
     env_dict["YNH_APP_OLD_DOMAIN"] = old_domain
     env_dict["YNH_APP_OLD_PATH"] = old_path
@@ -467,10 +468,11 @@ def app_upgrade(app=[], url=None, file=None, force=False):
 
         # Manage upgrade type and avoid any upgrade if there are nothing to do
         upgrade_type = "UNKNOWN"
+        # Get actual_version and new version
+        app_new_version = manifest.get("version", "?")
+        app_actual_version = app_dict.get("version", "?")
+
         if manifest.get("upgrade_only_if_version_changes", None) is True:
-            # Get actual_version and new version
-            app_actual_version = manifest["version"]
-            app_new_version = app_dict["version"]
 
             # do only the upgrade if there are a change
             if app_actual_version == app_new_version and not force:
@@ -511,6 +513,8 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
         env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
         env_dict["YNH_APP_UPGRADE_TYPE"] = upgrade_type
+        env_dict["YNH_APP_MANIFEST_VERSION"] = app_new_version
+        env_dict["YNH_APP_OLD_VERSION"] = app_actual_version
 
         # Start register change on system
         related_to = [('app', app_instance_name)]
@@ -723,6 +727,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
     env_dict["YNH_APP_ID"] = app_id
     env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
     env_dict["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
+    env_dict["YNH_APP_MANIFEST_VERSION"] = manifest.get("version", "?")
 
     # Start register change on system
     operation_logger.extra.update({'env': env_dict})
@@ -831,6 +836,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
             env_dict_remove["YNH_APP_ID"] = app_id
             env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name
             env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
+            env_dict["YNH_APP_MANIFEST_VERSION"] = manifest.get("version", "?")
 
             # Execute remove script
             operation_logger_remove = OperationLogger('remove_on_failed_install',
@@ -1008,6 +1014,7 @@ def app_remove(operation_logger, app):
     env_dict["YNH_APP_ID"] = app_id
     env_dict["YNH_APP_INSTANCE_NAME"] = app
     env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
+    env_dict["YNH_APP_MANIFEST_VERSION"] = manifest.get("version", "?")
     operation_logger.extra.update({'env': env_dict})
     operation_logger.flush()
 

From 640a46728078898251808210aec7e2b8c1c17d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 13 Apr 2020 16:59:32 +0200
Subject: [PATCH 04/29] Add helper ynh_compare_package_version

---
 data/helpers.d/utils | 49 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index 9ea9294bc..2cf9d2a7f 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -479,3 +479,52 @@ ynh_check_app_version_changed () {
   fi
   echo $return_value
 }
+
+# Compare the old package version and a other version passer as argument.
+# This is really useful we we need to do some action only for some old package version.
+#
+# example: ynh_compare_package_version --comparaison gt --version 2.3.2~ynh1
+# In word this example will check if the installed version is grater than (gt) the version 2.3.2~ynh1
+#
+# usage: ynh_compare_package_version --comparaision lt|gt|le|ge
+# | arg: --comparaison - comparaison type. Could be : le (lower than), gt (grater than), le (lower or equals), ge (grater or equals)
+# | arg: --version - The version to compare. Need to be a version in the yunohost package version type (like 2.3.1~ynh4)
+#
+# Requires YunoHost version 3.8.0 or higher.
+ynh_compare_package_version() {
+    local legacy_args=cv
+    declare -Ar args_array=( [c]=comparaison= [v]=version= )
+
+    local version
+    local comparaison
+    local old_version=$YNH_APP_OLD_VERSION
+    # Manage arguments with getopts
+    ynh_handle_getopts_args "$@"
+
+    if [[ ! $version =~ '~ynh' ]] || [[ ! $old_version =~ '~ynh' ]]; then
+        ynh_print_warn "Invalid agument for version."
+        return 1
+    fi
+
+    if [ $version == $old_version ]; then
+        if [ $comparaison == ge ] || [ $comparaison == le ]; then
+            return 0
+        else
+            return 1
+        fi
+    fi
+
+    if [ $comparaison == ge ] || [ $comparaison == gt ]; then
+        if [ $(printf "$version\n$old_version" | sort -V | tail -n 1) == $old_version ]; then
+            return 0
+        else
+            return 1
+        fi
+    else
+        if [ $(printf "$version\n$old_version" | sort -V | tail -n 1) == $version ]; then
+            return 0
+        else
+            return 1
+        fi
+    fi
+}

From 3484f73506e75cb4d44beb2bdb40f6b5509b8cb3 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Tue, 14 Apr 2020 12:35:35 +0200
Subject: [PATCH 05/29] Clean and syntax

---
 data/helpers.d/utils | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index 576fa5a56..c491b1aa0 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -486,48 +486,58 @@ ynh_check_app_version_changed () {
   echo $return_value
 }
 
-# Compare the old package version and a other version passer as argument.
-# This is really useful we we need to do some action only for some old package version.
+# Compare the current package version against another version given as an argument.
+# This is really useful when we need to do some actions only for some old package versions.
 #
-# example: ynh_compare_package_version --comparaison gt --version 2.3.2~ynh1
-# In word this example will check if the installed version is grater than (gt) the version 2.3.2~ynh1
+# example: ynh_compare_package_version --comparison gt --version 2.3.2~ynh1
+# This example will check if the installed version is greater than (gt) the version 2.3.2~ynh1
 #
-# usage: ynh_compare_package_version --comparaision lt|gt|le|ge
-# | arg: --comparaison - comparaison type. Could be : le (lower than), gt (grater than), le (lower or equals), ge (grater or equals)
+# usage: ynh_compare_package_version --comparison lt|gt|le|ge
+# | arg: --comparison - Comparison type. Could be : le (lower than), gt (greater than), le (lower or equal), ge (greater or equal)
 # | arg: --version - The version to compare. Need to be a version in the yunohost package version type (like 2.3.1~ynh4)
 #
+# Return 0 if the evaluation is true. 1 if false.
+#
 # Requires YunoHost version 3.8.0 or higher.
 ynh_compare_package_version() {
     local legacy_args=cv
-    declare -Ar args_array=( [c]=comparaison= [v]=version= )
-
+    declare -Ar args_array=( [c]=comparison= [v]=version= )
     local version
-    local comparaison
-    local old_version=$YNH_APP_OLD_VERSION
+    local comparison
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
 
-    if [[ ! $version =~ '~ynh' ]] || [[ ! $old_version =~ '~ynh' ]]; then
+    local current_version=$YNH_APP_OLD_VERSION
+
+    # Check the syntax of the versions
+    if [[ ! $version =~ '~ynh' ]] || [[ ! $current_version =~ '~ynh' ]]
+    then
         ynh_print_warn "Invalid agument for version."
         return 1
     fi
 
-    if [ $version == $old_version ]; then
-        if [ $comparaison == ge ] || [ $comparaison == le ]; then
+    # If the version are identical, and the evaluation allows equal versions.
+    if [ $version == $current_version ]
+    then
+        if [ $comparison == ge ] || [ $comparison == le ]; then
             return 0
         else
             return 1
         fi
     fi
 
-    if [ $comparaison == ge ] || [ $comparaison == gt ]; then
-        if [ $(printf "$version\n$old_version" | sort -V | tail -n 1) == $old_version ]; then
+    # Check if the current version is greater than the one given as argument
+    if [ $comparison == ge ] || [ $comparison == gt ]
+    then
+        if [ $(printf "$version\n$current_version" | sort --version-sort | tail -n 1) == $current_version ]; then
             return 0
         else
             return 1
         fi
+
+    # Else if the current version is lower than the one given as argument
     else
-        if [ $(printf "$version\n$old_version" | sort -V | tail -n 1) == $version ]; then
+        if [ $(printf "$version\n$current_version" | sort --version-sort | tail -n 1) == $version ]; then
             return 0
         else
             return 1

From 14ef523585834aff3cfd280020ce5f06f4aeda20 Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Tue, 14 Apr 2020 13:45:05 +0200
Subject: [PATCH 06/29] Improve env_dict variable in upgrade

Co-Authored-By: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
---
 src/yunohost/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index ff112ec14..5e4e9abf4 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -514,7 +514,7 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
         env_dict["YNH_APP_UPGRADE_TYPE"] = upgrade_type
         env_dict["YNH_APP_MANIFEST_VERSION"] = app_new_version
-        env_dict["YNH_APP_OLD_VERSION"] = app_actual_version
+        env_dict["YNH_APP_CURRENT_VERSION"] = app_actual_version
 
         # Start register change on system
         related_to = [('app', app_instance_name)]

From 3d51e235e89815ce6da247ccaa92cb5ff956e54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 14 Apr 2020 13:56:19 +0200
Subject: [PATCH 07/29] Add comments

---
 data/helpers.d/utils | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index c491b1aa0..759d9f1b1 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -492,6 +492,12 @@ ynh_check_app_version_changed () {
 # example: ynh_compare_package_version --comparison gt --version 2.3.2~ynh1
 # This example will check if the installed version is greater than (gt) the version 2.3.2~ynh1
 #
+# Generally you might probably use it as follow in the upgrade script
+#
+# if ynh_compare_package_version --comparaison gt --version 2.3.2~ynh1; then
+#     # Do something that is needed for the package version older than 2.3.2~ynh1
+# fi
+#
 # usage: ynh_compare_package_version --comparison lt|gt|le|ge
 # | arg: --comparison - Comparison type. Could be : le (lower than), gt (greater than), le (lower or equal), ge (greater or equal)
 # | arg: --version - The version to compare. Need to be a version in the yunohost package version type (like 2.3.1~ynh4)
@@ -519,6 +525,7 @@ ynh_compare_package_version() {
     # If the version are identical, and the evaluation allows equal versions.
     if [ $version == $current_version ]
     then
+        # manage equals case.
         if [ $comparison == ge ] || [ $comparison == le ]; then
             return 0
         else

From fec5d3d084849980e43d2b5bc49da6d939797879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 14 Apr 2020 14:01:01 +0200
Subject: [PATCH 08/29] Rename variable

---
 data/helpers.d/utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index 759d9f1b1..65b6d0d1c 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -513,7 +513,7 @@ ynh_compare_package_version() {
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
 
-    local current_version=$YNH_APP_OLD_VERSION
+    local current_version=$YNH_APP_CURRENT_VERSION
 
     # Check the syntax of the versions
     if [[ ! $version =~ '~ynh' ]] || [[ ! $current_version =~ '~ynh' ]]

From 17e8bdedf6ade8cfed69cf4ec7895c688c925e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 14 Apr 2020 14:03:04 +0200
Subject: [PATCH 09/29] Rename heper

---
 data/helpers.d/utils | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index 65b6d0d1c..e1fdc1333 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -489,23 +489,24 @@ ynh_check_app_version_changed () {
 # Compare the current package version against another version given as an argument.
 # This is really useful when we need to do some actions only for some old package versions.
 #
-# example: ynh_compare_package_version --comparison gt --version 2.3.2~ynh1
+# example: ynh_compare_current_package_version --comparison gt --version 2.3.2~ynh1
 # This example will check if the installed version is greater than (gt) the version 2.3.2~ynh1
 #
 # Generally you might probably use it as follow in the upgrade script
 #
-# if ynh_compare_package_version --comparaison gt --version 2.3.2~ynh1; then
+# if ynh_compare_current_package_version --comparaison gt --version 2.3.2~ynh1
+# then
 #     # Do something that is needed for the package version older than 2.3.2~ynh1
 # fi
 #
-# usage: ynh_compare_package_version --comparison lt|gt|le|ge
+# usage: ynh_compare_current_package_version --comparison lt|gt|le|ge
 # | arg: --comparison - Comparison type. Could be : le (lower than), gt (greater than), le (lower or equal), ge (greater or equal)
 # | arg: --version - The version to compare. Need to be a version in the yunohost package version type (like 2.3.1~ynh4)
 #
 # Return 0 if the evaluation is true. 1 if false.
 #
 # Requires YunoHost version 3.8.0 or higher.
-ynh_compare_package_version() {
+ynh_compare_current_package_version() {
     local legacy_args=cv
     declare -Ar args_array=( [c]=comparison= [v]=version= )
     local version

From 5315807ea76a8c2a0c23e49e2b7681202fb7f23f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 14 Apr 2020 14:04:26 +0200
Subject: [PATCH 10/29] Cleanup comment

---
 data/helpers.d/utils | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index e1fdc1333..f9db320d5 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -526,7 +526,6 @@ ynh_compare_current_package_version() {
     # If the version are identical, and the evaluation allows equal versions.
     if [ $version == $current_version ]
     then
-        # manage equals case.
         if [ $comparison == ge ] || [ $comparison == le ]; then
             return 0
         else

From 35785888608c370f8dc00c0b664f290df0e9bf6d Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Wed, 15 Apr 2020 11:53:39 +0200
Subject: [PATCH 11/29] Replace actual by current

Co-Authored-By: Alexandre Aubin <alex.aubin@mailoo.org>
---
 src/yunohost/app.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 5e4e9abf4..baccb3359 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -468,28 +468,28 @@ def app_upgrade(app=[], url=None, file=None, force=False):
 
         # Manage upgrade type and avoid any upgrade if there are nothing to do
         upgrade_type = "UNKNOWN"
-        # Get actual_version and new version
+        # Get current_version and new version
         app_new_version = manifest.get("version", "?")
-        app_actual_version = app_dict.get("version", "?")
+        app_current_version = app_dict.get("version", "?")
 
         if manifest.get("upgrade_only_if_version_changes", None) is True:
 
             # do only the upgrade if there are a change
-            if app_actual_version == app_new_version and not force:
+            if app_current_version == app_new_version and not force:
                 logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
                 # Save update time
                 now = int(time.time())
                 app_setting(app_instance_name, 'update_time', now)
                 app_setting(app_instance_name, 'current_revision', manifest.get('remote', {}).get('revision', "?"))
                 continue
-            elif app_actual_version == app_new_version:
+            elif app_current_version == app_new_version:
                 upgrade_type = "UPGRADE_FORCED"
-            elif "~ynh" in app_actual_version and "~ynh" in app_new_version:
-                app_actual_version_upstream, app_actual_version_pkg = app_actual_version.split("~ynh")
+            elif "~ynh" in app_current_version and "~ynh" in app_new_version:
+                app_current_version_upstream, app_current_version_pkg = app_current_version.split("~ynh")
                 app_new_version_upstream, app_new_version_pkg = app_new_version.split("~ynh")
-                if app_actual_version_upstream == app_new_version_upstream:
+                if app_current_version_upstream == app_new_version_upstream:
                     upgrade_type = "UPGRADE_PACKAGE"
-                elif app_actual_version_pkg == app_new_version_pkg:
+                elif app_current_version_pkg == app_new_version_pkg:
                     upgrade_type = "UPGRADE_APP"
                 else:
                     upgrade_type = "UPGRADE_FULL"

From f416b94fb8915aa38b8dabfaf19d553783be4e8f Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Wed, 15 Apr 2020 11:54:55 +0200
Subject: [PATCH 12/29] Put upgrade_only_if_version_changes in integration
 section

Co-Authored-By: Alexandre Aubin <alex.aubin@mailoo.org>
---
 src/yunohost/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index baccb3359..938984167 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -472,7 +472,7 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         app_new_version = manifest.get("version", "?")
         app_current_version = app_dict.get("version", "?")
 
-        if manifest.get("upgrade_only_if_version_changes", None) is True:
+        if manifest.get('integration', {}).get("upgrade_only_if_version_changes", None) is True:
 
             # do only the upgrade if there are a change
             if app_current_version == app_new_version and not force:

From d947724b70df83f7ec2a6448490ef660286e6748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Wed, 15 Apr 2020 11:57:21 +0200
Subject: [PATCH 13/29] Fix typo

---
 data/helpers.d/utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index f9db320d5..68ce6c7f2 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -494,7 +494,7 @@ ynh_check_app_version_changed () {
 #
 # Generally you might probably use it as follow in the upgrade script
 #
-# if ynh_compare_current_package_version --comparaison gt --version 2.3.2~ynh1
+# if ynh_compare_current_package_version --comparaison lt --version 2.3.2~ynh1
 # then
 #     # Do something that is needed for the package version older than 2.3.2~ynh1
 # fi

From ceeb34f68edc67d277ac8187ee14d5493af72f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Wed, 15 Apr 2020 12:07:45 +0200
Subject: [PATCH 14/29] Use 'dpkg --compare-versions'

---
 data/helpers.d/utils | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index 68ce6c7f2..29eba2f07 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -499,8 +499,9 @@ ynh_check_app_version_changed () {
 #     # Do something that is needed for the package version older than 2.3.2~ynh1
 # fi
 #
-# usage: ynh_compare_current_package_version --comparison lt|gt|le|ge
-# | arg: --comparison - Comparison type. Could be : le (lower than), gt (greater than), le (lower or equal), ge (greater or equal)
+# usage: ynh_compare_current_package_version --comparison lt|le|eq|ne|ge|gt
+# | arg: --comparison - Comparison type. Could be : le (lower than), le (lower or equal),
+# | eq (equal), ne (not equal), ge (greater or equal), gt (greater than)
 # | arg: --version - The version to compare. Need to be a version in the yunohost package version type (like 2.3.1~ynh4)
 #
 # Return 0 if the evaluation is true. 1 if false.
@@ -519,35 +520,14 @@ ynh_compare_current_package_version() {
     # Check the syntax of the versions
     if [[ ! $version =~ '~ynh' ]] || [[ ! $current_version =~ '~ynh' ]]
     then
-        ynh_print_warn "Invalid agument for version."
-        return 1
+        ynh_die "Invalid argument for version."
     fi
 
-    # If the version are identical, and the evaluation allows equal versions.
-    if [ $version == $current_version ]
-    then
-        if [ $comparison == ge ] || [ $comparison == le ]; then
-            return 0
-        else
-            return 1
-        fi
+    # Check validity of the comparator
+    if [[ ! $comparison =~ (lt|le|eq|ne|ge|gt) ]]; then
+        ynh_die "Invialid comparator must be : lt, le, eq, ne, ge, gt"
     fi
 
-    # Check if the current version is greater than the one given as argument
-    if [ $comparison == ge ] || [ $comparison == gt ]
-    then
-        if [ $(printf "$version\n$current_version" | sort --version-sort | tail -n 1) == $current_version ]; then
-            return 0
-        else
-            return 1
-        fi
-
-    # Else if the current version is lower than the one given as argument
-    else
-        if [ $(printf "$version\n$current_version" | sort --version-sort | tail -n 1) == $version ]; then
-            return 0
-        else
-            return 1
-        fi
-    fi
+    # Return the return value of dpkg --compare-versions
+    dpkg --compare-versions $current_version $comparison $version
 }

From 8dd3986cace2d771e3ad3e400331b89e6330c96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Wed, 15 Apr 2020 12:17:01 +0200
Subject: [PATCH 15/29] Fix rename variable

---
 src/yunohost/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 938984167..57e89e2a7 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -514,7 +514,7 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
         env_dict["YNH_APP_UPGRADE_TYPE"] = upgrade_type
         env_dict["YNH_APP_MANIFEST_VERSION"] = app_new_version
-        env_dict["YNH_APP_CURRENT_VERSION"] = app_actual_version
+        env_dict["YNH_APP_CURRENT_VERSION"] = app_current_version
 
         # Start register change on system
         related_to = [('app', app_instance_name)]

From 4f0d5cef964faf62164a1f7d8bca9426ded07314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Wed, 15 Apr 2020 16:25:35 +0200
Subject: [PATCH 16/29] Improve version management in '_app_upgradable'

---
 src/yunohost/app.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 57e89e2a7..bdfead85c 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -156,10 +156,18 @@ def app_info(app, full=False):
 
 
 def _app_upgradable(app_infos):
+    from packaging import version
 
     # Determine upgradability
     # In case there is neither update_time nor install_time, we assume the app can/has to be upgraded
 
+    # Firstly use the version to know if an upgrade is available
+    if app_infos["version"] != "-" and app_infos["from_catalog"]["manifest"].get("version", None):
+        if version.parse(app_infos["version"]) < version.parse(app_infos["from_catalog"]["manifest"].get("version", "-")):
+            return "yes"
+        else:
+            return "no"
+
     if not app_infos.get("from_catalog", None):
         return "url_required"
     if not app_infos["from_catalog"].get("lastUpdate") or not app_infos["from_catalog"].get("git"):

From a096a36e27c1606bc5cc27664c97a96335229c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Wed, 15 Apr 2020 16:30:11 +0200
Subject: [PATCH 17/29] Also manage downgrade

---
 src/yunohost/app.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index bdfead85c..9305673d7 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -429,6 +429,7 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         url -- Git url to fetch for upgrade
 
     """
+    from packaging import version
     from yunohost.hook import hook_add, hook_remove, hook_exec, hook_callback
     from yunohost.permission import permission_sync_to_user
 
@@ -483,13 +484,15 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         if manifest.get('integration', {}).get("upgrade_only_if_version_changes", None) is True:
 
             # do only the upgrade if there are a change
-            if app_current_version == app_new_version and not force:
+            if version.parse(app_current_version) >= version.parse(app_new_version) and not force:
                 logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
                 # Save update time
                 now = int(time.time())
                 app_setting(app_instance_name, 'update_time', now)
                 app_setting(app_instance_name, 'current_revision', manifest.get('remote', {}).get('revision', "?"))
                 continue
+            elif version.parse(app_current_version) > version.parse(app_new_version):
+                upgrade_type = "DOWNGRADE_FORCED"
             elif app_current_version == app_new_version:
                 upgrade_type = "UPGRADE_FORCED"
             elif "~ynh" in app_current_version and "~ynh" in app_new_version:

From 9389f4669cd061d6026ef6102ce8190d853488d1 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 15 Apr 2020 21:13:46 +0200
Subject: [PATCH 18/29] simplification

---
 data/helpers.d/utils | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index 29eba2f07..b6f3e7071 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -489,8 +489,8 @@ ynh_check_app_version_changed () {
 # Compare the current package version against another version given as an argument.
 # This is really useful when we need to do some actions only for some old package versions.
 #
-# example: ynh_compare_current_package_version --comparison gt --version 2.3.2~ynh1
-# This example will check if the installed version is greater than (gt) the version 2.3.2~ynh1
+# example: ynh_compare_current_package_version --comparison lt --version 2.3.2~ynh1
+# This example will check if the installed version is lower than (lt) the version 2.3.2~ynh1
 #
 # Generally you might probably use it as follow in the upgrade script
 #
@@ -500,7 +500,7 @@ ynh_check_app_version_changed () {
 # fi
 #
 # usage: ynh_compare_current_package_version --comparison lt|le|eq|ne|ge|gt
-# | arg: --comparison - Comparison type. Could be : le (lower than), le (lower or equal),
+# | arg: --comparison - Comparison type. Could be : lt (lower than), le (lower or equal),
 # | eq (equal), ne (not equal), ge (greater or equal), gt (greater than)
 # | arg: --version - The version to compare. Need to be a version in the yunohost package version type (like 2.3.1~ynh4)
 #

From e7970d8571495e0814914389ae3e6e6f0863b91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 23 Apr 2020 14:30:37 +0200
Subject: [PATCH 19/29] Check settings 'upgrade_only_if_version_changes' before
 to check update availability

---
 src/yunohost/app.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 9305673d7..055ee8f29 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -162,7 +162,8 @@ def _app_upgradable(app_infos):
     # In case there is neither update_time nor install_time, we assume the app can/has to be upgraded
 
     # Firstly use the version to know if an upgrade is available
-    if app_infos["version"] != "-" and app_infos["from_catalog"]["manifest"].get("version", None):
+    if app_infos["manifest"].get('integration', {}).get("upgrade_only_if_version_changes", None) is True and \
+       '~ynh' in app_infos["version"] and app_infos["from_catalog"]["manifest"].get("version", None):
         if version.parse(app_infos["version"]) < version.parse(app_infos["from_catalog"]["manifest"].get("version", "-")):
             return "yes"
         else:

From 1826e3c5b66044940317e4296429e0b11b08035a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 23 Apr 2020 14:31:05 +0200
Subject: [PATCH 20/29] Make more robust version management in upgrade

---
 src/yunohost/app.py | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 055ee8f29..74a626597 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -483,28 +483,30 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         app_current_version = app_dict.get("version", "?")
 
         if manifest.get('integration', {}).get("upgrade_only_if_version_changes", None) is True:
-
-            # do only the upgrade if there are a change
-            if version.parse(app_current_version) >= version.parse(app_new_version) and not force:
-                logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
-                # Save update time
-                now = int(time.time())
-                app_setting(app_instance_name, 'update_time', now)
-                app_setting(app_instance_name, 'current_revision', manifest.get('remote', {}).get('revision', "?"))
-                continue
-            elif version.parse(app_current_version) > version.parse(app_new_version):
-                upgrade_type = "DOWNGRADE_FORCED"
-            elif app_current_version == app_new_version:
-                upgrade_type = "UPGRADE_FORCED"
-            elif "~ynh" in app_current_version and "~ynh" in app_new_version:
-                app_current_version_upstream, app_current_version_pkg = app_current_version.split("~ynh")
-                app_new_version_upstream, app_new_version_pkg = app_new_version.split("~ynh")
-                if app_current_version_upstream == app_new_version_upstream:
-                    upgrade_type = "UPGRADE_PACKAGE"
-                elif app_current_version_pkg == app_new_version_pkg:
-                    upgrade_type = "UPGRADE_APP"
+            if "~ynh" in app_current_version and "~ynh" in app_new_version:
+                if version.parse(app_current_version) >= version.parse(app_new_version) and not force:
+                    # No new version available
+                    logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
+                    # Save update time
+                    now = int(time.time())
+                    app_setting(app_instance_name, 'update_time', now)
+                    app_setting(app_instance_name, 'current_revision', manifest.get('remote', {}).get('revision', "?"))
+                    continue
+                elif version.parse(app_current_version) > version.parse(app_new_version):
+                    upgrade_type = "DOWNGRADE_FORCED"
+                elif app_current_version == app_new_version:
+                    upgrade_type = "UPGRADE_FORCED"
                 else:
-                    upgrade_type = "UPGRADE_FULL"
+                    app_current_version_upstream, app_current_version_pkg = app_current_version.split("~ynh")
+                    app_new_version_upstream, app_new_version_pkg = app_new_version.split("~ynh")
+                    if app_current_version_upstream == app_new_version_upstream:
+                        upgrade_type = "UPGRADE_PACKAGE"
+                    elif app_current_version_pkg == app_new_version_pkg:
+                        upgrade_type = "UPGRADE_APP"
+                    else:
+                        upgrade_type = "UPGRADE_FULL"
+            else:
+                logger.warning("/!\\ Packagers ! You have enabled the setting 'upgrade_only_if_version_changes' but you haven't used the official way to define the package version")
 
         # Check requirements
         _check_manifest_requirements(manifest, app_instance_name=app_instance_name)

From c34de0b792177676939c97a9d66f12e95bec3d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Fri, 24 Apr 2020 14:26:31 +0200
Subject: [PATCH 21/29] Improve version management in catalog

---
 src/yunohost/app.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 74a626597..5f0084f08 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -162,9 +162,13 @@ def _app_upgradable(app_infos):
     # In case there is neither update_time nor install_time, we assume the app can/has to be upgraded
 
     # Firstly use the version to know if an upgrade is available
-    if app_infos["manifest"].get('integration', {}).get("upgrade_only_if_version_changes", None) is True and \
-       '~ynh' in app_infos["version"] and app_infos["from_catalog"]["manifest"].get("version", None):
-        if version.parse(app_infos["version"]) < version.parse(app_infos["from_catalog"]["manifest"].get("version", "-")):
+    app_is_in_catalog = bool(app_infos.get("from_catalog"))
+    upgrade_only_if_version_changes = app_infos["manifest"].get('integration', {}).get("upgrade_only_if_version_changes", None) is True
+    installed_version = version.parse(app_infos["version"])
+    version_in_catalog = version.parse(app_infos.get("from_catalog", {}).get("manifest", {}).get("version", "0~ynh0"))
+    
+    if app_is_in_catalog and '~ynh' in app_infos["version"]:
+        if upgrade_only_if_version_changes and installed_version < version_in_catalog:
             return "yes"
         else:
             return "no"

From ce6c33aa9000e838cf483ad42071461e315eea4f Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Mon, 27 Apr 2020 11:05:01 +0200
Subject: [PATCH 22/29] Fix version key in installed version

Co-Authored-By: Alexandre Aubin <alex.aubin@mailoo.org>
---
 src/yunohost/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 5f0084f08..d23877035 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -164,7 +164,7 @@ def _app_upgradable(app_infos):
     # Firstly use the version to know if an upgrade is available
     app_is_in_catalog = bool(app_infos.get("from_catalog"))
     upgrade_only_if_version_changes = app_infos["manifest"].get('integration', {}).get("upgrade_only_if_version_changes", None) is True
-    installed_version = version.parse(app_infos["version"])
+    installed_version = version.parse(app_infos.get("version", "0~ynh0"))
     version_in_catalog = version.parse(app_infos.get("from_catalog", {}).get("manifest", {}).get("version", "0~ynh0"))
     
     if app_is_in_catalog and '~ynh' in app_infos["version"]:

From f2791c911f71cb253b1f6e4ea119d8a4e17e6339 Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Mon, 27 Apr 2020 11:08:36 +0200
Subject: [PATCH 23/29] Make more rebobut version check

Co-Authored-By: Alexandre Aubin <alex.aubin@mailoo.org>
---
 src/yunohost/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index d23877035..2d087a0d4 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -167,7 +167,7 @@ def _app_upgradable(app_infos):
     installed_version = version.parse(app_infos.get("version", "0~ynh0"))
     version_in_catalog = version.parse(app_infos.get("from_catalog", {}).get("manifest", {}).get("version", "0~ynh0"))
     
-    if app_is_in_catalog and '~ynh' in app_infos["version"]:
+    if app_is_in_catalog and '~ynh' in str(installed_version) and '~ynh' in str(version_in_catalog):
         if upgrade_only_if_version_changes and installed_version < version_in_catalog:
             return "yes"
         else:

From 01d5c91e60c7cc08f12058ddd893b587d9d6ccb9 Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Mon, 27 Apr 2020 11:09:10 +0200
Subject: [PATCH 24/29] Simply code

Co-Authored-By: Alexandre Aubin <alex.aubin@mailoo.org>
---
 src/yunohost/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 2d087a0d4..3d17869f5 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -173,7 +173,7 @@ def _app_upgradable(app_infos):
         else:
             return "no"
 
-    if not app_infos.get("from_catalog", None):
+    if not app_is_in_catalog:
         return "url_required"
     if not app_infos["from_catalog"].get("lastUpdate") or not app_infos["from_catalog"].get("git"):
         return "url_required"

From 72b412c6d3d9a18489b1d288425201a18078112a Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Mon, 27 Apr 2020 11:16:40 +0200
Subject: [PATCH 25/29] Cleanup code indentation

---
 src/yunohost/app.py | 58 +++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 3d17869f5..45cad35b8 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -480,37 +480,39 @@ def app_upgrade(app=[], url=None, file=None, force=False):
             logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
             continue
 
-        # Manage upgrade type and avoid any upgrade if there are nothing to do
+# Manage upgrade type and avoid any upgrade if there is nothing to do
         upgrade_type = "UNKNOWN"
+        upgrade_only_if_version_changes = manifest.get('integration', {}).get("upgrade_only_if_version_changes", None) is True
         # Get current_version and new version
-        app_new_version = manifest.get("version", "?")
-        app_current_version = app_dict.get("version", "?")
-
-        if manifest.get('integration', {}).get("upgrade_only_if_version_changes", None) is True:
-            if "~ynh" in app_current_version and "~ynh" in app_new_version:
-                if version.parse(app_current_version) >= version.parse(app_new_version) and not force:
-                    # No new version available
-                    logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
-                    # Save update time
-                    now = int(time.time())
-                    app_setting(app_instance_name, 'update_time', now)
-                    app_setting(app_instance_name, 'current_revision', manifest.get('remote', {}).get('revision', "?"))
-                    continue
-                elif version.parse(app_current_version) > version.parse(app_new_version):
-                    upgrade_type = "DOWNGRADE_FORCED"
-                elif app_current_version == app_new_version:
-                    upgrade_type = "UPGRADE_FORCED"
-                else:
-                    app_current_version_upstream, app_current_version_pkg = app_current_version.split("~ynh")
-                    app_new_version_upstream, app_new_version_pkg = app_new_version.split("~ynh")
-                    if app_current_version_upstream == app_new_version_upstream:
-                        upgrade_type = "UPGRADE_PACKAGE"
-                    elif app_current_version_pkg == app_new_version_pkg:
-                        upgrade_type = "UPGRADE_APP"
-                    else:
-                        upgrade_type = "UPGRADE_FULL"
+        app_new_version = version.parse(manifest.get("version", "?"))
+        app_current_version = version.parse(app_dict.get("version", "?"))
+        if "~ynh" not in str(app_current_version) or "~ynh" not in str(app_new_version):
+            logger.warning("/!\\ Packagers ! You have enabled the setting 'upgrade_only_if_version_changes' but you haven't used the official way to define the package version")
+            upgrade_only_if_version_changes = False
+        if upgrade_only_if_version_changes:
+            if app_current_version >= app_new_version and not force:
+                # In case of upgrade from file or custom repository
+                # No new version available
+                logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
+                # Save update time
+                now = int(time.time())
+                app_setting(app_instance_name, 'update_time', now)
+                app_setting(app_instance_name, 'current_revision', manifest.get('remote', {}).get('revision', "?"))
+                continue
+            elif app_current_version > app_new_version:
+                upgrade_type = "DOWNGRADE_FORCED"
+            elif app_current_version == app_new_version:
+                upgrade_type = "UPGRADE_FORCED"
             else:
-                logger.warning("/!\\ Packagers ! You have enabled the setting 'upgrade_only_if_version_changes' but you haven't used the official way to define the package version")
+                app_current_version_upstream, app_current_version_pkg = str(app_current_version).split("~ynh")
+                app_new_version_upstream, app_new_version_pkg = str(app_new_version).split("~ynh")
+                if app_current_version_upstream == app_new_version_upstream:
+                    upgrade_type = "UPGRADE_PACKAGE"
+                elif app_current_version_pkg == app_new_version_pkg:
+                    upgrade_type = "UPGRADE_APP"
+                else:
+                    upgrade_type = "UPGRADE_FULL"
+
 
         # Check requirements
         _check_manifest_requirements(manifest, app_instance_name=app_instance_name)

From e01859ffc4b8aa6759adc75ff8920eff59d23026 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 27 Apr 2020 20:57:38 +0200
Subject: [PATCH 26/29] Fix tests

---
 src/yunohost/app.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 45cad35b8..2ab729a37 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -166,7 +166,7 @@ def _app_upgradable(app_infos):
     upgrade_only_if_version_changes = app_infos["manifest"].get('integration', {}).get("upgrade_only_if_version_changes", None) is True
     installed_version = version.parse(app_infos.get("version", "0~ynh0"))
     version_in_catalog = version.parse(app_infos.get("from_catalog", {}).get("manifest", {}).get("version", "0~ynh0"))
-    
+
     if app_is_in_catalog and '~ynh' in str(installed_version) and '~ynh' in str(version_in_catalog):
         if upgrade_only_if_version_changes and installed_version < version_in_catalog:
             return "yes"
@@ -480,7 +480,7 @@ def app_upgrade(app=[], url=None, file=None, force=False):
             logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
             continue
 
-# Manage upgrade type and avoid any upgrade if there is nothing to do
+        # Manage upgrade type and avoid any upgrade if there is nothing to do
         upgrade_type = "UNKNOWN"
         upgrade_only_if_version_changes = manifest.get('integration', {}).get("upgrade_only_if_version_changes", None) is True
         # Get current_version and new version
@@ -533,8 +533,8 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
         env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
         env_dict["YNH_APP_UPGRADE_TYPE"] = upgrade_type
-        env_dict["YNH_APP_MANIFEST_VERSION"] = app_new_version
-        env_dict["YNH_APP_CURRENT_VERSION"] = app_current_version
+        env_dict["YNH_APP_MANIFEST_VERSION"] = str(app_new_version)
+        env_dict["YNH_APP_CURRENT_VERSION"] = str(app_current_version)
 
         # Start register change on system
         related_to = [('app', app_instance_name)]

From 5c6b4118b7d41f2fb2b25034eb92fb825d4d255c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Sat, 2 May 2020 11:20:27 +0200
Subject: [PATCH 27/29] Add comment about dependances

---
 src/yunohost/app.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 2ab729a37..f3af1daa0 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -156,6 +156,9 @@ def app_info(app, full=False):
 
 
 def _app_upgradable(app_infos):
+    # python-pkg-resources contains the packaging module
+    # yunohost depends of python-jinja2 and python-jinja2 depends of python-pkg-resources
+    # so packaging module should be available on all yunohost instances
     from packaging import version
 
     # Determine upgradability
@@ -434,6 +437,9 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         url -- Git url to fetch for upgrade
 
     """
+    # python-pkg-resources contains the packaging module
+    # yunohost depends of python-jinja2 and python-jinja2 depends of python-pkg-resources
+    # so packaging module should be available on all yunohost instances
     from packaging import version
     from yunohost.hook import hook_add, hook_remove, hook_exec, hook_callback
     from yunohost.permission import permission_sync_to_user

From 8d2bde84ec749770e50575780ee8a979bfb80a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Sun, 3 May 2020 19:56:14 +0200
Subject: [PATCH 28/29] Install python-packaging as dependance

---
 debian/control      | 2 +-
 src/yunohost/app.py | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 5061ad4f2..db448f405 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
  , moulinette (>= 3.7), ssowat (>= 3.7)
  , python-psutil, python-requests, python-dnspython, python-openssl
- , python-apt, python-miniupnpc, python-dbus, python-jinja2
+ , python-apt, python-miniupnpc, python-dbus, python-jinja2, python-packaging,
  , python-toml
  , apt, apt-transport-https
  , nginx, nginx-extras (>=1.6.2)
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 452b4f7c4..edee217ce 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -183,9 +183,6 @@ def app_info(app, full=False):
 
 
 def _app_upgradable(app_infos):
-    # python-pkg-resources contains the packaging module
-    # yunohost depends of python-jinja2 and python-jinja2 depends of python-pkg-resources
-    # so packaging module should be available on all yunohost instances
     from packaging import version
 
     # Determine upgradability
@@ -467,9 +464,6 @@ def app_upgrade(app=[], url=None, file=None, force=False):
         url -- Git url to fetch for upgrade
 
     """
-    # python-pkg-resources contains the packaging module
-    # yunohost depends of python-jinja2 and python-jinja2 depends of python-pkg-resources
-    # so packaging module should be available on all yunohost instances
     from packaging import version
     from yunohost.hook import hook_add, hook_remove, hook_exec, hook_callback
     from yunohost.permission import permission_sync_to_user

From 3612ac434d0d01411d64c9a92b4335f6fff4ad62 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 31 Aug 2020 19:45:41 +0200
Subject: [PATCH 29/29] Enable this behavior by default (no need to enable the
 option in the app manifest)

---
 src/yunohost/app.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index cac7b45c3..bffe1e7a1 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -189,15 +189,12 @@ def _app_upgradable(app_infos):
 
     # Firstly use the version to know if an upgrade is available
     app_is_in_catalog = bool(app_infos.get("from_catalog"))
-    upgrade_only_if_version_changes = app_infos["manifest"].get('integration', {}).get("upgrade_only_if_version_changes", None) is True
     installed_version = version.parse(app_infos.get("version", "0~ynh0"))
     version_in_catalog = version.parse(app_infos.get("from_catalog", {}).get("manifest", {}).get("version", "0~ynh0"))
 
     if app_is_in_catalog and '~ynh' in str(installed_version) and '~ynh' in str(version_in_catalog):
-        if upgrade_only_if_version_changes and installed_version < version_in_catalog:
+        if installed_version < version_in_catalog:
             return "yes"
-        else:
-            return "no"
 
     if not app_is_in_catalog:
         return "url_required"
@@ -512,14 +509,10 @@ def app_upgrade(app=[], url=None, file=None, force=False):
 
         # Manage upgrade type and avoid any upgrade if there is nothing to do
         upgrade_type = "UNKNOWN"
-        upgrade_only_if_version_changes = manifest.get('integration', {}).get("upgrade_only_if_version_changes", None) is True
         # Get current_version and new version
         app_new_version = version.parse(manifest.get("version", "?"))
         app_current_version = version.parse(app_dict.get("version", "?"))
-        if "~ynh" not in str(app_current_version) or "~ynh" not in str(app_new_version):
-            logger.warning("/!\\ Packagers ! You have enabled the setting 'upgrade_only_if_version_changes' but you haven't used the official way to define the package version")
-            upgrade_only_if_version_changes = False
-        if upgrade_only_if_version_changes:
+        if "~ynh" in str(app_current_version) and "~ynh" in str(app_new_version):
             if app_current_version >= app_new_version and not force:
                 # In case of upgrade from file or custom repository
                 # No new version available
@@ -543,7 +536,6 @@ def app_upgrade(app=[], url=None, file=None, force=False):
                 else:
                     upgrade_type = "UPGRADE_FULL"
 
-
         # Check requirements
         _check_manifest_requirements(manifest, app_instance_name=app_instance_name)
         _assert_system_is_sane_for_app(manifest, "pre")