From 62555000b628f3389370135a6f58a3deeb63ae22 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 19 May 2014 23:58:06 -0500
Subject: backward compat for psutil p.cmdline. Closes: #5689

---
 src/leap/bitmask/services/eip/vpnprocess.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py
index 1559ea8b..734b88df 100644
--- a/src/leap/bitmask/services/eip/vpnprocess.py
+++ b/src/leap/bitmask/services/eip/vpnprocess.py
@@ -30,9 +30,11 @@ import psutil
 try:
     # psutil < 2.0.0
     from psutil.error import AccessDenied as psutil_AccessDenied
+    PSUTIL_2 = False
 except ImportError:
     # psutil >= 2.0.0
     from psutil import AccessDenied as psutil_AccessDenied
+    PSUTIL_2 = True
 
 from leap.bitmask.config import flags
 from leap.bitmask.config.providerconfig import ProviderConfig
@@ -676,7 +678,13 @@ class VPNManager(object):
                 # we need to be able to filter out arguments in the form
                 # --openvpn-foo, since otherwise we are shooting ourselves
                 # in the feet.
-                if any(map(lambda s: s.find("LEAPOPENVPN") != -1, p.cmdline)):
+
+                if PSUTIL_2:
+                    cmdline = p.cmdline()
+                else:
+                    cmdline = p.cmdline
+                if any(map(lambda s: s.find(
+                        "LEAPOPENVPN") != -1, cmdline)):
                     openvpn_process = p
                     break
             except psutil_AccessDenied:
-- 
cgit v1.2.3


From 8fbcc9219f58f17a60c58089dcdfd286d5646133 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 20 May 2014 10:59:44 -0500
Subject: remove psutil <2.0 pinning

---
 pkg/requirements.pip | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 70427e63..3d6b33a3 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -11,10 +11,7 @@ srp>=1.0.2
 pyopenssl
 python-dateutil
 
-# since gnupg requires exactly 1.2.1, this chokes if we
-# don't specify a version. Selecting something lesser than
-# 2.0 is equivalent to pick 1.2.1. See #5489
-psutil<2.0
+psutil
 
 ipaddr
 twisted
-- 
cgit v1.2.3


From a68960c1dcb7670687cb08610c9132cdf9b5a595 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 20 May 2014 18:54:57 -0500
Subject: changes file

---
 changes/feature-5689-psutil-compat | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/feature-5689-psutil-compat

diff --git a/changes/feature-5689-psutil-compat b/changes/feature-5689-psutil-compat
new file mode 100644
index 00000000..be11aea3
--- /dev/null
+++ b/changes/feature-5689-psutil-compat
@@ -0,0 +1 @@
+- Make use of cmdline in psutil backwards-compatible. Closes: #5689
-- 
cgit v1.2.3