summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-11 10:11:16 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-11 10:11:16 -0300
commit16165296ef5d9d0964b5820dbe707c3b0adaffc2 (patch)
treefc0b325ffdf23c5220ad07eeff294b8def32ff3c
parent76a2c224f26dbf270c49789ef779804baa1596f9 (diff)
parentea12da968e2bda017ca161298c5560bf7dcfce42 (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/relax-psutil-pinning' into develop
-rw-r--r--pkg/requirements.pip7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 1a8ac7ae..70427e63 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -10,7 +10,12 @@ requests>=1.1.0
srp>=1.0.2
pyopenssl
python-dateutil
-psutil==1.2.1
+
+# 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
+
ipaddr
twisted
python-daemon # this should not be needed for Windows.