From 042dd95de515a178f3971a553ec96f5f0a9204d2 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Tue, 23 Aug 2022 09:09:24 -0400 Subject: [PATCH] janus: Handle upgrades to 1.0.* Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- plinth/modules/janus/__init__.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/plinth/modules/janus/__init__.py b/plinth/modules/janus/__init__.py index b0b0b7d51..734fb7368 100644 --- a/plinth/modules/janus/__init__.py +++ b/plinth/modules/janus/__init__.py @@ -13,8 +13,8 @@ from plinth.modules.apache.components import Webserver from plinth.modules.backups.components import BackupRestore from plinth.modules.coturn.components import TurnTimeLimitedConsumer from plinth.modules.firewall.components import Firewall -from plinth.package import Packages -from plinth.utils import format_lazy +from plinth.package import Packages, install +from plinth.utils import Version, format_lazy from . import manifest, privileged @@ -91,3 +91,17 @@ class JanusApp(app_module.App): super().setup(old_version) privileged.setup() self.enable() + + def force_upgrade(self, packages): + """Force upgrade janus to resolve conffile prompts.""" + if 'janus' not in packages: + return False + + # Allow upgrades within 1.0.* + package = packages['janus'] + if Version(package['new_version']) > Version('1.1~'): + return False + + install(['janus'], force_configuration='new') + privileged.setup() + return True