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 <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2019-08-08 11:35:01 -07:00 committed by James Valleroy
parent 0cf099fe4f
commit 639fd71d88
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808

View File

@ -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')