From 820709938e4313e04bab160115cc215769c3a1fb Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Thu, 1 Jun 2017 03:06:51 +0200
Subject: [refactor] improve error reporting when openvpn not found

---
 src/leap/bitmask/vpn/vpn.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/leap/bitmask/vpn/vpn.py')

diff --git a/src/leap/bitmask/vpn/vpn.py b/src/leap/bitmask/vpn/vpn.py
index 677c9b91..23f0a582 100644
--- a/src/leap/bitmask/vpn/vpn.py
+++ b/src/leap/bitmask/vpn/vpn.py
@@ -44,7 +44,12 @@ class VPNManager(object):
             return False
         print(Fore.GREEN + "Firewall: started" + Fore.RESET)
 
-        vpn_ok = self._vpn.start()
+        try:
+            vpn_ok = self._vpn.start()
+        except Exception:
+            self.starting = False
+            return False
+
         if not vpn_ok:
             print (Fore.RED + "VPN: Error starting." + Fore.RESET)
             self._firewall.stop()
@@ -52,6 +57,7 @@ class VPNManager(object):
             self.starting = False
             return False
         print(Fore.GREEN + "VPN: started" + Fore.RESET)
+        return True
 
     def stop(self):
         self.starting = False
-- 
cgit v1.2.3