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

Replace actual by current

Browse source 
Co-Authored-By: Alexandre Aubin <alex.aubin@mailoo.org>
This commit is contained in:
Josue-T 2020-04-15 11:53:39 +02:00 • committed by GitHub
parent 5315807ea7
commit 3578588860
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/yunohost/app.py
View file

@ -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 # Manage upgrade type and avoid any upgrade if there are nothing to do
upgrade_type = "UNKNOWN" upgrade_type = "UNKNOWN"
# Get actual_version and new version # Get current_version and new version
app_new_version = manifest.get("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: if manifest.get("upgrade_only_if_version_changes", None) is True:
# do only the upgrade if there are a change # 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)) 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 app_actual_version == app_new_version: elif app_current_version == app_new_version:
upgrade_type = "UPGRADE_FORCED" upgrade_type = "UPGRADE_FORCED"
elif "~ynh" in app_actual_version and "~ynh" in app_new_version: elif "~ynh" in app_current_version and "~ynh" in app_new_version:
app_actual_version_upstream, app_actual_version_pkg = app_actual_version.split("~ynh") 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") 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" 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" upgrade_type = "UPGRADE_APP"
else: else:
upgrade_type = "UPGRADE_FULL" upgrade_type = "UPGRADE_FULL"