nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrades: Get result of start-dist-upgrade

Browse Source 
Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
This commit is contained in:
James Valleroy 2021-01-28 21:32:48 -05:00 committed by Veiko Aasa
parent 906816f7cb
commit d747f77f80
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions/upgrades
View File

@ -5,6 +5,7 @@ Configures or runs unattended-upgrades
""" """
import argparse import argparse
import json
import logging import logging
import os import os
import pathlib import pathlib
@ -478,7 +479,6 @@ def subcommand_start_dist_upgrade(arguments):
if updates are enabled. if updates are enabled.
""" """
upgrade_ready, reason = _check_dist_upgrade(arguments.test) upgrade_ready, reason = _check_dist_upgrade(arguments.test)
print(reason)
if upgrade_ready: if upgrade_ready:
with open(DIST_UPGRADE_SERVICE_PATH, 'w') as service_file: with open(DIST_UPGRADE_SERVICE_PATH, 'w') as service_file:
service_file.write(DIST_UPGRADE_SERVICE) service_file.write(DIST_UPGRADE_SERVICE)
@ -489,6 +489,12 @@ def subcommand_start_dist_upgrade(arguments):
stderr=subprocess.DEVNULL, close_fds=True, stderr=subprocess.DEVNULL, close_fds=True,
start_new_session=True) start_new_session=True)
print(
json.dumps({
'dist_upgrade_started': upgrade_ready,
'reason': reason,
}))
def subcommand_dist_upgrade(_): def subcommand_dist_upgrade(_):
"""Perform major distribution upgrade. """Perform major distribution upgrade.

8
plinth/modules/upgrades/__init__.py
View File

@ -3,6 +3,7 @@
FreedomBox app for upgrades. FreedomBox app for upgrades.
""" """
import json
import logging import logging
import os import os
import subprocess import subprocess
@ -178,7 +179,12 @@ def setup_repositories(data):
actions.superuser_run('upgrades', command) actions.superuser_run('upgrades', command)
if is_dist_upgrade_enabled(): if is_dist_upgrade_enabled():
actions.superuser_run('upgrades', ['start-dist-upgrade']) output = actions.superuser_run('upgrades', ['start-dist-upgrade'])
result = json.loads(output)
dist_upgrade_started = result['dist_upgrade_started']
reason = result['reason']
logger.info('Result of start-dist-upgrade: %s, %s',
dist_upgrade_started, reason)
def is_backports_requested(): def is_backports_requested():