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

Correctly split version string 

We changed the version format
This commit is contained in:
Philipp Hörist 2017-11-24 16:49:30 +01:00
parent 9322ed4405
commit 276daa991c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gajim/common/optparser.py
View File

@ -57,7 +57,7 @@ class OptionsParser:
return False
new_version = app.config.get('version')
new_version = new_version.split('-', 1)[0]
new_version = new_version.split('+', 1)[0]
seen = set()
regex = re.compile(r"(?P<optname>[^.=]+)(?:(?:\.(?P<key>.+))?\.(?P<subname>[^.=]+))?\s=\s(?P<value>.*)")
@ -82,7 +82,7 @@ class OptionsParser:
app.config.set_per(optname, key, subname, value)
old_version = app.config.get('version')
old_version = old_version.split('-', 1)[0]
old_version = old_version.split('+', 1)[0]
self.update_config(old_version, new_version)
self.old_values = {} # clean mem

2
gajim/plugins/pluginmanager.py
View File

@ -509,7 +509,7 @@ class PluginManager(metaclass=Singleton):
min_v = conf.get('info', 'min_gajim_version', fallback=None)
max_v = conf.get('info', 'max_gajim_version', fallback=None)
gajim_v = app.config.get('version').split('-', 1)[0]
gajim_v = app.config.get('version').split('+', 1)[0]
gajim_v_cmp = parse_version(gajim_v)
if min_v and gajim_v_cmp < parse_version(min_v):