nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

updates: Eliminate delay and better status for manual upgrade

Browse Source 
Helps: #1939.

Implements a proposal by Sunil Mohan Adapa in !1936.

Signed-off-by: Fioddor Superconcentrado <fioddor@gmail.com>
[sunil: Cosmetic changes]
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
Fioddor Superconcentrado 2020-10-14 18:22:21 +02:00 committed by Sunil Mohan Adapa
parent 792c2cd00f
commit 4ea6e952c9
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plinth/modules/upgrades/views.py
View File

@ -2,7 +2,7 @@
""" """
FreedomBox app for upgrades. FreedomBox app for upgrades.
""" """
import time import subprocess
from apt.cache import Cache from apt.cache import Cache
from django.contrib import messages from django.contrib import messages
@ -34,7 +34,8 @@ class UpgradesConfigurationView(AppView):
context = super().get_context_data(*args, **kwargs) context = super().get_context_data(*args, **kwargs)
context['can_activate_backports'] = upgrades.can_activate_backports() context['can_activate_backports'] = upgrades.can_activate_backports()
context['is_backports_requested'] = upgrades.is_backports_requested() context['is_backports_requested'] = upgrades.is_backports_requested()
context['is_busy'] = package.is_package_manager_busy() context['is_busy'] = (_is_updating()
or package.is_package_manager_busy())
context['log'] = get_log() context['log'] = get_log()
context['refresh_page_sec'] = 3 if context['is_busy'] else None context['refresh_page_sec'] = 3 if context['is_busy'] else None
context['version'] = __version__ context['version'] = __version__
@ -95,18 +96,19 @@ def get_log():
return actions.superuser_run('upgrades', ['get-log']) return actions.superuser_run('upgrades', ['get-log'])
def _is_updating():
"""Check if manually triggered update is running."""
command = ['systemctl', 'is-active', 'freedombox-manual-upgrade']
result = subprocess.run(command, capture_output=True, text=True)
return str(result.stdout).startswith('activ') # 'active' or 'activating'
def upgrade(request): def upgrade(request):
"""Serve the upgrade page.""" """Serve the upgrade page."""
secs_for_package_to_get_busy = 2
if request.method == 'POST': if request.method == 'POST':
try: try:
actions.superuser_run('upgrades', ['run']) actions.superuser_run('upgrades', ['run'])
messages.success(request, _('Upgrade process started.')) messages.success(request, _('Upgrade process started.'))
# Give the Package module some time to get busy so the page enters
# the refreshing loop. XXX: Remove after changing the busy check
# implementation include activating state of
# freedombox-manual-upgrade.service.
time.sleep(secs_for_package_to_get_busy)
except ActionError: except ActionError:
messages.error(request, _('Starting upgrade failed.')) messages.error(request, _('Starting upgrade failed.'))