diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-08-08 12:21:07 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-08-08 12:21:07 -0300 |
| commit | e2e6e15fb6546890d39e427b43023bbcc4ceb75f (patch) | |
| tree | 7eeb9e12d2f81daf7a953f00c24bcecb4530e46b /src/leap | |
| parent | 2bb9737ef4b17b363e95bd5221cbba34751c75bd (diff) | |
| parent | 9cd81d9be4e8bb5303b8843f6fe7bab8202d4f2b (diff) | |
Merge remote-tracking branch 'chiiph/bug/fix_openvpn_verb' into develop
Diffstat (limited to 'src/leap')
| -rw-r--r-- | src/leap/services/eip/vpnlaunchers.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py index dadbf859..cbbd4de2 100644 --- a/src/leap/services/eip/vpnlaunchers.py +++ b/src/leap/services/eip/vpnlaunchers.py @@ -407,7 +407,8 @@ class LinuxVPNLauncher(VPNLauncher): args.append(openvpn) openvpn = first(pkexec) - args += ['--verb', '%d' % (openvpn_verb,)] + if openvpn_verb is not None: + args += ['--verb', '%d' % (openvpn_verb,)] gateway_selector = VPNGatewaySelector(eipconfig) gateways = gateway_selector.get_gateways() @@ -657,7 +658,8 @@ class DarwinVPNLauncher(VPNLauncher): openvpn = first(openvpn_possibilities) args = [openvpn] - args += ['--verb', '%d' % (openvpn_verb,)] + if openvpn_verb is not None: + args += ['--verb', '%d' % (openvpn_verb,)] gateway_selector = VPNGatewaySelector(eipconfig) gateways = gateway_selector.get_gateways() @@ -823,7 +825,8 @@ class WindowsVPNLauncher(VPNLauncher): openvpn = first(openvpn_possibilities) args = [] - args += ['--verb', '%d' % (openvpn_verb,)] + if openvpn_verb is not None: + args += ['--verb', '%d' % (openvpn_verb,)] gateway_selector = VPNGatewaySelector(eipconfig) gateways = gateway_selector.get_gateways() |