diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-20 12:34:17 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-20 12:34:17 -0300 |
| commit | 963ca06117f8a87139a4ba84da80684892d810d4 (patch) | |
| tree | 5583a1e0d70beb85f25394d4edce042919c25248 | |
| parent | 175fcd7e82035dd4806ffb9b55364d000c44caaf (diff) | |
| parent | aea8c4ca44d39ff68dd622584a31a3f04fc86354 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/better-version-handling' into develop
| -rw-r--r-- | changes/feature-use-better-version-handler | 1 | ||||
| -rw-r--r-- | src/leap/keymanager/__init__.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/changes/feature-use-better-version-handler b/changes/feature-use-better-version-handler new file mode 100644 index 0000000..57fabcc --- /dev/null +++ b/changes/feature-use-better-version-handler @@ -0,0 +1 @@ + o Use a better version handler for the gnupg version check. diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py index aa4e2e7..4edcdd0 100644 --- a/src/leap/keymanager/__init__.py +++ b/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 "*******" |