From 639fd71d889bc72570dfedd8c1eaa3abef5cf7a3 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 8 Aug 2019 11:35:01 -0700 Subject: [PATCH] firewall: Force upgrade to firewalld 0.7.x Closes: #1608 Allow upgrade to any version of 0.7.x series. Use new configuration and apply the two default configuration changes of FreedomBox. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/firewall/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plinth/modules/firewall/__init__.py b/plinth/modules/firewall/__init__.py index 9722333a2..c6bf7384b 100644 --- a/plinth/modules/firewall/__init__.py +++ b/plinth/modules/firewall/__init__.py @@ -83,8 +83,8 @@ def force_upgrade(helper, packages): # firewalld 0.4.4.6-2 -> 0.6.x package = packages['firewalld'] - if Version(package['current_version']) >= Version('0.6') or \ - Version(package['new_version']) < Version('0.6'): + if Version(package['current_version']) >= Version('0.7') or \ + Version(package['new_version']) < Version('0.7'): return False helper.install(['firewalld'], force_configuration='new')