summaryrefslogtreecommitdiff
path: root/src/leap/eip/openvpnconnection.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-09-06 03:15:53 +0900
committerkali <kali@leap.se>2012-09-06 03:15:53 +0900
commit75f4128f5ed515c4df57275bf1479ccdf741c83f (patch)
treedfae021c1586afad3ce9b4b5e3e99bbecf0f5c23 /src/leap/eip/openvpnconnection.py
parent5756a05eb9b66e46df55544d224e2dce7c312452 (diff)
make tests pass.
forgot to update eipconnection tests after #504 changes :(
Diffstat (limited to 'src/leap/eip/openvpnconnection.py')
-rw-r--r--src/leap/eip/openvpnconnection.py34
1 files changed, 12 insertions, 22 deletions
diff --git a/src/leap/eip/openvpnconnection.py b/src/leap/eip/openvpnconnection.py
index 4a6a495a..ec8b48bf 100644
--- a/src/leap/eip/openvpnconnection.py
+++ b/src/leap/eip/openvpnconnection.py
@@ -57,16 +57,16 @@ to be triggered for each one of them.
self.proto = None
##################################
- # XXX move all error messages
- # into a more encapsulated object.
- self.missing_pkexec = False
- self.missing_auth_agent = False
-
- self.bad_keyfile_perms = False
- self.missing_vpn_keyfile = False
- self.missing_provider = False
- self.missing_definition = False
- self.bad_provider = False
+ # This is handled by Exception attrs
+ # now (see #504)
+ #self.missing_pkexec = False
+ #self.missing_auth_agent = False
+
+ #self.bad_keyfile_perms = False
+ #self.missing_vpn_keyfile = False
+ #self.missing_provider = False
+ #self.missing_definition = False
+ #self.bad_provider = False
#################################
#XXX workaround for signaling
@@ -107,27 +107,17 @@ to be triggered for each one of them.
except eip_exceptions.EIPNoPolkitAuthAgentAvailable:
command = args = None
# XXX deprecate
- self.missing_auth_agent = True
+ #self.missing_auth_agent = True
raise
except eip_exceptions.EIPNoPkexecAvailable:
command = args = None
- self.missing_pkexec = True
+ #self.missing_pkexec = True
raise
# XXX if not command, signal error.
self.command = command
self.args = args
- def _get_or_create_config(self):
- """
- retrieves the config options from defaults or
- home file, or config file passed in command line.
- populates command and args to be passed to subprocess.
- """
- # XXX does nothing.
- # XXX should get config? or get from checker?
- pass
-
def _check_vpn_keys(self):
"""
checks for correct permissions on vpn keys