summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-09 14:29:19 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-09 14:29:19 -0300
commit8189c837a4058d4b0b8ec35a1c705d374d6793c8 (patch)
treef07281566bfc6647e5adacd101547a8ccb1e9aa1 /src/leap
parente498d8d7e2449bba5ad016645899a9a59df4f16d (diff)
parent1ba5cb91ea5d0f29f16316d984dc685e8180b88f (diff)
Merge remote-tracking branch 'kali/bug/fix-assertion-error-gnupg' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/keymanager/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py
index f2cffd5..a550598 100644
--- a/src/leap/keymanager/__init__.py
+++ b/src/leap/keymanager/__init__.py
@@ -27,14 +27,17 @@ try:
from distutils.version import LooseVersion as V
assert(V(__version__) >= V('1.2.3'))
-except ImportError, AssertionError:
+except (ImportError, AssertionError):
+ print "*******"
print "Ooops! It looks like there is a conflict in the installed version "
print "of gnupg."
+ print
print "Disclaimer: Ideally, we would need to work a patch and propose the "
print "merge to upstream. But until then do: "
print
print "% pip uninstall python-gnupg"
print "% pip install gnupg"
+ print "*******"
sys.exit(1)
import logging