diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-10-09 12:26:29 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-10-09 12:26:29 -0300 |
| commit | e498d8d7e2449bba5ad016645899a9a59df4f16d (patch) | |
| tree | b5ba90c9cf090c7d839d35fb0642862d623d2c35 | |
| parent | 713179ee9c7e89f2cf1d0630247c047f59b5166f (diff) | |
| parent | caed9561be46254dd3eed1d6d23bc1cf474f727e (diff) | |
Merge remote-tracking branch 'kali/bump-also-sanity-check' into develop
| -rw-r--r-- | pkg/requirements.pip | 2 | ||||
| -rw-r--r-- | src/leap/keymanager/__init__.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index acb783c..1515204 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,4 +1,6 @@ leap.common>=0.3.0 simplejson requests +# if we bump the gnupg version, bump also the sanity check +# in keymanager.__init__ gnupg>=1.2.3 diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py index edd0ba1..f2cffd5 100644 --- a/src/leap/keymanager/__init__.py +++ b/src/leap/keymanager/__init__.py @@ -25,7 +25,7 @@ try: assert(GPGUtilities) # pyflakes happy from gnupg import __version__ from distutils.version import LooseVersion as V - assert(V(__version__) >= V('1.2.2')) + assert(V(__version__) >= V('1.2.3')) except ImportError, AssertionError: print "Ooops! It looks like there is a conflict in the installed version " |