copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't print twice nbxmpp version error message. Fixes #7720

This commit is contained in:
Yann Leboulanger 2014-04-09 18:02:30 +02:00
parent 711a40e33c
commit 3657642f58
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gajim.py
View File

@ -68,19 +68,26 @@ if os.name == 'nt':
except ImportError: except ImportError:
pass pass
HAS_NBXMPP=True
MIN_NBXMPP_VER = "0.3.3"
try: try:
import nbxmpp import nbxmpp
except ImportError: except ImportError:
HAS_NBXMPP=False
if not HAS_NBXMPP:
print('Gajim needs python-nbxmpp to run. Quiting...') print('Gajim needs python-nbxmpp to run. Quiting...')
sys.exit() sys.exit()
try: try:
from distutils.version import LooseVersion as V from distutils.version import LooseVersion as V
if V(nbxmpp.__version__) < V("0.3.3"): if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER):
print('Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...') HAS_NBXMPP=False
sys.exit()
except: 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() sys.exit()
#from common import demandimport #from common import demandimport