summaryrefslogtreecommitdiff
path: root/src/leap/services/eip
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-06-20 08:05:19 +0900
committerkali <kali@leap.se>2013-06-20 08:05:19 +0900
commit5a24038bc1956ffcd0602a9a65cecbd76b88ccce (patch)
treefbce40ae77c3c991388ee26dbb584dab93e9d47b /src/leap/services/eip
parent071119352a04698cf5dfaba0ae9c3827e016fb94 (diff)
parentc640e979a202021111a2b14e9ec089d78118fbb6 (diff)
Merge remote-tracking branch 'ivan-github/bug/2936_fix-psutil-error-import' into develop
Diffstat (limited to 'src/leap/services/eip')
-rw-r--r--src/leap/services/eip/vpnprocess.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/leap/services/eip/vpnprocess.py b/src/leap/services/eip/vpnprocess.py
index 4b558160..d9fa85a6 100644
--- a/src/leap/services/eip/vpnprocess.py
+++ b/src/leap/services/eip/vpnprocess.py
@@ -20,6 +20,7 @@ VPN Manager, spawned in a custom processProtocol.
import logging
import os
import psutil
+import psutil.error
import shutil
import socket