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 | 2ba4b1638020346567358e803452dc42925d97ab (patch) | |
| tree | ba9ec7b66e34e14ab685ad55eee1444a6286c1d3 /keymanager | |
| parent | a0836925e6f84327002212f838b343392b1f2c7e (diff) | |
| parent | 542c4a5b7bf1c95bdfcb4059e9968412b0e53d67 (diff) | |
Merge remote-tracking branch 'kali/bump-also-sanity-check' into develop
Diffstat (limited to 'keymanager')
| -rw-r--r-- | keymanager/pkg/requirements.pip | 2 | ||||
| -rw-r--r-- | keymanager/src/leap/keymanager/__init__.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/keymanager/pkg/requirements.pip b/keymanager/pkg/requirements.pip index acb783c9..1515204a 100644 --- a/keymanager/pkg/requirements.pip +++ b/keymanager/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/keymanager/src/leap/keymanager/__init__.py b/keymanager/src/leap/keymanager/__init__.py index edd0ba1f..f2cffd56 100644 --- a/keymanager/src/leap/keymanager/__init__.py +++ b/keymanager/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 " |