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

setup: Clarify success log message when force upgrading

Browse Source 
Currently, in cases of ignoring an upgrade and actually upgrading, the log
message says success which is somewhat confusing. Make the force_upgrade()
methods in apps return information about ignoring the upgrade and print log
message accordingly.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2019-08-08 11:28:24 -07:00 committed by James Valleroy
parent ecc28a72bd
commit acdcabcbed
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plinth/modules/bind/__init__.py
View File

@ -126,6 +126,7 @@ def setup(helper, old_version=None):
def force_upgrade(helper, _packages): def force_upgrade(helper, _packages):
"""Force upgrade the managed packages to resolve conffile prompt.""" """Force upgrade the managed packages to resolve conffile prompt."""
helper.install(managed_packages, force_configuration='old') helper.install(managed_packages, force_configuration='old')
return True
def diagnose(): def diagnose():

5
plinth/modules/firewall/__init__.py
View File

@ -79,16 +79,17 @@ def setup(helper, old_version=None):
def force_upgrade(helper, packages): def force_upgrade(helper, packages):
"""Force upgrade firewalld to resolve conffile prompts.""" """Force upgrade firewalld to resolve conffile prompts."""
if 'firewalld' not in packages: if 'firewalld' not in packages:
return return False
# firewalld 0.4.4.6-2 -> 0.6.x # firewalld 0.4.4.6-2 -> 0.6.x
package = packages['firewalld'] package = packages['firewalld']
if Version(package['current_version']) >= Version('0.6') or \ if Version(package['current_version']) >= Version('0.6') or \
Version(package['new_version']) < Version('0.6'): Version(package['new_version']) < Version('0.6'):
return return False
helper.install(['firewalld'], force_configuration='new') helper.install(['firewalld'], force_configuration='new')
_run(['setup'], superuser=True) _run(['setup'], superuser=True)
return True
def get_enabled_status(): def get_enabled_status():

5
plinth/modules/ttrss/__init__.py
View File

@ -123,16 +123,17 @@ def setup(helper, old_version=None):
def force_upgrade(helper, packages): def force_upgrade(helper, packages):
"""Force update package to resolve conffile prompts.""" """Force update package to resolve conffile prompts."""
if 'tt-rss' not in packages: if 'tt-rss' not in packages:
return return False
# tt-rss 17.4 -> 18.12 # tt-rss 17.4 -> 18.12
package = packages['tt-rss'] package = packages['tt-rss']
if Version(package['current_version']) >= Version('18.12') or \ if Version(package['current_version']) >= Version('18.12') or \
Version(package['new_version']) < Version('18.12'): Version(package['new_version']) < Version('18.12'):
return return False
helper.install(['tt-rss'], force_configuration='new') helper.install(['tt-rss'], force_configuration='new')
actions.superuser_run('ttrss', ['setup']) actions.superuser_run('ttrss', ['setup'])
return True
def diagnose(): def diagnose():

7
plinth/setup.py
View File

@ -508,8 +508,11 @@ class ForceUpgrader():
for app, packages in apps.items(): for app, packages in apps.items():
try: try:
logger.info('Force upgrading app: %s', app.name) logger.info('Force upgrading app: %s', app.name)
app.force_upgrade(app.setup_helper, packages) if app.force_upgrade(app.setup_helper, packages):
logger.info('Successfully force upgraded app: %s', app.name) logger.info('Successfully force upgraded app: %s',
app.name)
else:
logger.info('Ignored force upgrade for app: %s', app.name)
except Exception as exception: except Exception as exception:
logger.exception('Error running force upgrade: %s', exception) logger.exception('Error running force upgrade: %s', exception)
need_retry = True need_retry = True