From bd20b6570bfab4842d96df2436679bbc4f6f6f28 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 1 Mar 2019 16:51:49 -0800 Subject: [PATCH] ttrss: Implement upgrade from 17.4 to 18.12 Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- actions/ttrss | 3 ++- plinth/modules/ttrss/__init__.py | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/actions/ttrss b/actions/ttrss index 95ef60ddd..5cf2f45b0 100755 --- a/actions/ttrss +++ b/actions/ttrss @@ -81,7 +81,8 @@ def subcommand_setup(_): aug.save() - action_utils.service_try_restart('tt-rss') + if action_utils.service_is_enabled('tt-rss'): + action_utils.service_restart('tt-rss') def enable_api_access(): diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py index d2a818632..d4581c8fa 100644 --- a/plinth/modules/ttrss/__init__.py +++ b/plinth/modules/ttrss/__init__.py @@ -25,7 +25,7 @@ from plinth import action_utils, actions, cfg, frontpage from plinth import service as service_module from plinth.menu import main_menu from plinth.modules.users import register_group -from plinth.utils import format_lazy +from plinth.utils import Version, format_lazy from .manifest import backup, clients @@ -99,6 +99,21 @@ def setup(helper, old_version=None): helper.call('post', add_shortcut) +def force_upgrade(helper, packages): + """Force update package to resolve conffile prompts.""" + if 'tt-rss' not in packages: + return + + # tt-rss 17.4 -> 18.12 + package = packages['tt-rss'] + if Version(package['current_version']) >= Version('18.12') or \ + Version(package['new_version']) < Version('18.12'): + return + + helper.install(['tt-rss'], force_configuration='new') + actions.superuser_run('ttrss', ['setup']) + + def add_shortcut(): """Add a shortcut to the front page.""" frontpage.add_shortcut('ttrss', name, short_description=short_description,