changeset 26207c20eb5a in /home/hg/repos/gajim
author: Yann Leboulanger <[email protected]>
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=26207c20eb5a
description: don't print twice nbxmpp version error message. Fixes #7720
diffstat:
src/gajim.py | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diffs (34 lines):
diff -r ada1a31b497b -r 26207c20eb5a src/gajim.py
--- a/src/gajim.py Wed Apr 09 17:56:09 2014 +0200
+++ b/src/gajim.py Wed Apr 09 18:02:30 2014 +0200
@@ -68,19 +68,26 @@
except ImportError:
pass
+HAS_NBXMPP=True
+MIN_NBXMPP_VER = "0.3.3"
try:
import nbxmpp
except ImportError:
+ HAS_NBXMPP=False
+
+if not HAS_NBXMPP:
print('Gajim needs python-nbxmpp to run. Quiting...')
sys.exit()
try:
from distutils.version import LooseVersion as V
- if V(nbxmpp.__version__) < V("0.3.3"):
- print('Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...')
- sys.exit()
+ if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER):
+ HAS_NBXMPP=False
except:
- print('Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...')
+ HAS_NBXMPP=False
+
+if not HAS_NBXMPP:
+ print 'Gajim needs python-nbxmpp >= %s to run. Quiting...' % MIN_NBXMPP_VER
sys.exit()
#from common import demandimport
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
