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

Output gajim version readably in case of incompatibility

Browse source
This commit is contained in:
Linus Heckemann 2016-08-20 00:39:45 +02:00
parent 33fff8317d
commit ad1c89ce9f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/plugins/pluginmanager.py
View file

@ -32,7 +32,7 @@ import fnmatch
import zipfile import zipfile
from shutil import rmtree from shutil import rmtree
import configparser import configparser
import pkg_resources from pkg_resources import parse_version
from common import gajim from common import gajim
from common import nec from common import nec
@ -454,9 +454,10 @@ class PluginManager(metaclass=Singleton):
min_v = conf.get('info', 'min_gajim_version', fallback=None) min_v = conf.get('info', 'min_gajim_version', fallback=None)
max_v = conf.get('info', 'max_gajim_version', fallback=None) max_v = conf.get('info', 'max_gajim_version', fallback=None)
gajim_v = pkg_resources.parse_version(gajim.config.get('version')) gajim_v = gajim.config.get('version')
gajim_v_cmp = parse_version(gajim_v)
if min_v and gajim_v < pkg_resources.parse_version(min_v): if min_v and gajim_v_cmp < parse_version(min_v):
log.warning(('Plugin {plugin} not loaded, newer version of' log.warning(('Plugin {plugin} not loaded, newer version of'
'gajim required: {gajim_v} < {min_v}').format( 'gajim required: {gajim_v} < {min_v}').format(
plugin=elem_name, plugin=elem_name,
@ -464,7 +465,7 @@ class PluginManager(metaclass=Singleton):
min_v=min_v min_v=min_v
)) ))
continue continue
if max_v and gajim_v > pkg_resources.parse_version(max_v): if max_v and gajim_v_cmp > parse_version(max_v):
log.warning(('Plugin {plugin} not loaded, plugin incompatible ' log.warning(('Plugin {plugin} not loaded, plugin incompatible '
'with current version of gajim: ' 'with current version of gajim: '
'{gajim_v} > {max_v}').format( '{gajim_v} > {max_v}').format(