From c9d9d4736b67953e79993852245c1480f88e4004 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Mon, 23 Dec 2019 17:59:33 -0500 Subject: [PATCH] firewall: Support upgrading firewalld to 0.8 Closes #1737. Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- 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 c6bf7384b..c2e126cbb 100644 --- a/plinth/modules/firewall/__init__.py +++ b/plinth/modules/firewall/__init__.py @@ -81,9 +81,9 @@ def force_upgrade(helper, packages): if 'firewalld' not in packages: return False - # firewalld 0.4.4.6-2 -> 0.6.x + # firewalld 0.6.x -> 0.7.x, 0.6.x -> 0.8.x, 0.7.x -> 0.8.x package = packages['firewalld'] - if Version(package['current_version']) >= Version('0.7') or \ + if Version(package['current_version']) >= Version('0.8') or \ Version(package['new_version']) < Version('0.7'): return False