diff options
| author | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
| commit | db704eecf513fcc48365844523557d6edab28293 (patch) | |
| tree | f37516c86c5d77f23f7e57d80ee4c39b3b651c3e /src/leap/eip/openvpnconnection.py | |
| parent | add7973b3d1633b2776cb90f237415c6cac65d99 (diff) | |
| parent | 50396fca082652dd1a1617e0d029c1c726e4c651 (diff) | |
Merge branch 'develop' into feature/systray-menu
Conflicts:
src/leap/app.py
Diffstat (limited to 'src/leap/eip/openvpnconnection.py')
| -rw-r--r-- | src/leap/eip/openvpnconnection.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/leap/eip/openvpnconnection.py b/src/leap/eip/openvpnconnection.py index b679a544..92ae9de9 100644 --- a/src/leap/eip/openvpnconnection.py +++ b/src/leap/eip/openvpnconnection.py @@ -114,11 +114,10 @@ to be triggered for each one of them. """ try: eip_config.check_vpn_keys() - except eip_exceptions.EIPInitNoKeyFileError: - self.missing_vpn_keyfile = True except eip_exceptions.EIPInitBadKeyFilePermError: - logger.error('error while checking vpn keys') - self.bad_keyfile_perms = True + logger.error('Bad VPN Keys permission!') + # do nothing now + # and raise the rest ... def _launch_openvpn(self): """ |