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

Enable this behavior by default (no need to enable the option in the app manifest)

Browse source
This commit is contained in:
Alexandre Aubin 2020-08-31 19:45:41 +02:00
parent 7c6748e928
commit 3612ac434d
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/yunohost/app.py
View file

@ -189,15 +189,12 @@ def _app_upgradable(app_infos):
# Firstly use the version to know if an upgrade is available # Firstly use the version to know if an upgrade is available
app_is_in_catalog = bool(app_infos.get("from_catalog")) 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")) 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")) 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 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" return "yes"
else:
return "no"
if not app_is_in_catalog: if not app_is_in_catalog:
return "url_required" 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 # Manage upgrade type and avoid any upgrade if there is nothing to do
upgrade_type = "UNKNOWN" 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 # Get current_version and new version
app_new_version = version.parse(manifest.get("version", "?")) app_new_version = version.parse(manifest.get("version", "?"))
app_current_version = version.parse(app_dict.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): if "~ynh" in str(app_current_version) and "~ynh" 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: if app_current_version >= app_new_version and not force:
# In case of upgrade from file or custom repository # In case of upgrade from file or custom repository
# No new version available # No new version available
@ -543,7 +536,6 @@ def app_upgrade(app=[], url=None, file=None, force=False):
else: else:
upgrade_type = "UPGRADE_FULL" upgrade_type = "UPGRADE_FULL"
# Check requirements # Check requirements
_check_manifest_requirements(manifest, app_instance_name=app_instance_name) _check_manifest_requirements(manifest, app_instance_name=app_instance_name)
_assert_system_is_sane_for_app(manifest, "pre") _assert_system_is_sane_for_app(manifest, "pre")