summaryrefslogtreecommitdiff
path: root/src/leap/eip
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-24 02:39:34 +0900
committerkali <kali@leap.se>2013-01-24 02:39:34 +0900
commitfea677bb0e3c9ec43353f644879636b9a63a3634 (patch)
treeb53baf5046ed0bd996967bf5d332fb6f83de1f92 /src/leap/eip
parent8226d6032b6db0c15ff70e377f87f4acfdd21787 (diff)
parentff59da55ef9a176b36cef19d67e7ec363bf5d739 (diff)
Merge branch 'feature/fix-connect-page' into develop
Diffstat (limited to 'src/leap/eip')
-rw-r--r--src/leap/eip/eipconnection.py2
-rw-r--r--src/leap/eip/openvpnconnection.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/eip/eipconnection.py b/src/leap/eip/eipconnection.py
index 20b45e36..d012c567 100644
--- a/src/leap/eip/eipconnection.py
+++ b/src/leap/eip/eipconnection.py
@@ -177,7 +177,7 @@ class EIPConnection(OpenVPNConnection, StatusMixIn):
super(EIPConnection, self).__init__(*args, **kwargs)
- def connect(self):
+ def connect(self, **kwargs):
"""
entry point for connection process
"""
diff --git a/src/leap/eip/openvpnconnection.py b/src/leap/eip/openvpnconnection.py
index 05979ff7..4953db11 100644
--- a/src/leap/eip/openvpnconnection.py
+++ b/src/leap/eip/openvpnconnection.py
@@ -280,7 +280,6 @@ to be triggered for each one of them.
# checks
-
def _check_if_running_instance(self):
"""
check if openvpn is already running