diff options
author | Kali Kaneko <kali@leap.se> | 2015-07-23 14:34:53 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-07-23 14:34:53 -0400 |
commit | 8d355cabd0b087b5e7161c2721bb8ae94ace1336 (patch) | |
tree | c66297853cdc4c89cec06a38b7d46b68d21c4563 /src/leap/keymanager/__init__.py | |
parent | 5b5e5b935b58f430dc12842bc111b2ba9d0973a9 (diff) |
[pkg] avoid choking on latest gnupg version
latest gnupg version (from pypi) was '2.0.2-py2.7.egg', which is parsed
as a LegacyVersion and therefore breaks the numeric comparison. this is
a workaround to allow the sanity check to continue, by comparing just
the numeric part of the version string.
Diffstat (limited to 'src/leap/keymanager/__init__.py')
-rw-r--r-- | src/leap/keymanager/__init__.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py index c2d74096..56633c5d 100644 --- a/src/leap/keymanager/__init__.py +++ b/src/leap/keymanager/__init__.py @@ -24,13 +24,20 @@ try: from gnupg.gnupg import GPGUtilities assert(GPGUtilities) # pyflakes happy from gnupg import __version__ as _gnupg_version + if '-' in _gnupg_version: + # avoid Parsing it as LegacyVersion, get just + # the release numbers: + _gnupg_version = _gnupg_version.split('-')[0] from pkg_resources import parse_version + # We need to make sure that we're not colliding with the infamous + # python-gnupg assert(parse_version(_gnupg_version) >= parse_version('1.4.0')) except (ImportError, AssertionError): print "*******" print "Ooops! It looks like there is a conflict in the installed version " print "of gnupg." + print "GNUPG_VERSION:", _gnupg_version print print "Disclaimer: Ideally, we would need to work a patch and propose the " print "merge to upstream. But until then do: " |