From d9e3a66fe865b04bfaa63aa7acb6ffdb705b8370 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 25 Apr 2019 14:42:08 -0700 Subject: [PATCH] Try to fix up Firewall extension namespacing --- builders/windows-builder.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 80e7df0..4fe18d4 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -165,16 +165,14 @@ class WindowsBuilder(Builder): if 'OpenLP.exe' in source: description = 'Firewall exception for OpenLP\'s remote interface (UDP)' program = '[#file_e368869eb54b01e2288a3359b1cf51f8]' - namespace = 'http://schemas.microsoft.com/wix/FirewallExtension' - nsmap = {'fx': namespace} - component.append(E.FirewallException(Id='1797D56F-0AD4-81A6-6011-F8AE0B7CFB4F', Name='OpenLP', + component.append(E.FirewallException('fw:FirewallException', + Id='1797D56F-0AD4-81A6-6011-F8AE0B7CFB4F', Name='OpenLP', Description=description, IgnoreFailure='yes', - Program=program, Protocol='tcp', Scope='any', - namespace=namespace, nsmap=nsmap)) - component.append(E.FirewallException(Id='183115E6-A080-964D-4A4F-43880083F189', Name='OpenLP', + Program=program, Protocol='tcp', Scope='any')) + component.append(E.FirewallException('fw:FirewallException', + Id='183115E6-A080-964D-4A4F-43880083F189', Name='OpenLP', Description=description, IgnoreFailure='yes', - Program=program, Protocol='udp', Scope='any', - namespace=namespace, nsmap=nsmap)) + Program=program, Protocol='udp', Scope='any')) element.append(component) components.append(component)