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

Make more robust version management in upgrade

Browse source
This commit is contained in:
Josué Tille 2020-04-23 14:31:05 +02:00
parent e7970d8571
commit 1826e3c5b6
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/yunohost/app.py
View file

@ -483,28 +483,30 @@ def app_upgrade(app=[], url=None, file=None, force=False):
app_current_version = app_dict.get("version", "?") app_current_version = app_dict.get("version", "?")
if manifest.get('integration', {}).get("upgrade_only_if_version_changes", None) is True: 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:
# do only the upgrade if there are a change if version.parse(app_current_version) >= version.parse(app_new_version) and not force:
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)) logger.success(m18n.n('app_already_up_to_date', app=app_instance_name))
# Save update time # Save update time
now = int(time.time()) now = int(time.time())
app_setting(app_instance_name, 'update_time', now) app_setting(app_instance_name, 'update_time', now)
app_setting(app_instance_name, 'current_revision', manifest.get('remote', {}).get('revision', "?")) app_setting(app_instance_name, 'current_revision', manifest.get('remote', {}).get('revision', "?"))
continue continue
elif version.parse(app_current_version) > version.parse(app_new_version): elif version.parse(app_current_version) > version.parse(app_new_version):
upgrade_type = "DOWNGRADE_FORCED" upgrade_type = "DOWNGRADE_FORCED"
elif app_current_version == app_new_version: elif app_current_version == app_new_version:
upgrade_type = "UPGRADE_FORCED" 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"
else: 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 requirements
_check_manifest_requirements(manifest, app_instance_name=app_instance_name) _check_manifest_requirements(manifest, app_instance_name=app_instance_name)