summaryrefslogtreecommitdiff
path: root/keymanager
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-01-09 16:53:19 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-01-09 16:54:37 -0300
commitcbaf583dc68661fe4f0cc9ee9aedde6d6ec0de9a (patch)
tree580c2b6b60c0aff153131a1066fdeab91fbd272d /keymanager
parentbd5e5ea19b1cb16cbd3441bf17cee1e7842d8212 (diff)
Use a better version handler.
Diffstat (limited to 'keymanager')
-rw-r--r--keymanager/changes/feature-use-better-version-handler1
-rw-r--r--keymanager/src/leap/keymanager/__init__.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/keymanager/changes/feature-use-better-version-handler b/keymanager/changes/feature-use-better-version-handler
new file mode 100644
index 0000000..57fabcc
--- /dev/null
+++ b/keymanager/changes/feature-use-better-version-handler
@@ -0,0 +1 @@
+ o Use a better version handler for the gnupg version check.
diff --git a/keymanager/src/leap/keymanager/__init__.py b/keymanager/src/leap/keymanager/__init__.py
index aa4e2e7..4edcdd0 100644
--- a/keymanager/src/leap/keymanager/__init__.py
+++ b/keymanager/src/leap/keymanager/__init__.py
@@ -23,9 +23,9 @@ import sys
try:
from gnupg.gnupg import GPGUtilities
assert(GPGUtilities) # pyflakes happy
- from gnupg import __version__
- from distutils.version import LooseVersion as V
- assert(V(__version__) >= V('1.2.3'))
+ from gnupg import __version__ as _gnupg_version
+ from pkg_resources import parse_version
+ assert(parse_version(_gnupg_version) >= parse_version('1.2.3'))
except (ImportError, AssertionError):
print "*******"