Philipp Hörist pushed to branch master at gajim / gajim

Commits: 276daa99 by Philipp Hörist at 2017-11-24T16:49:30+01:00 Correctly split version string

We changed the version format

- - - - -

2 changed files:

- gajim/common/optparser.py - gajim/plugins/pluginmanager.py

Changes:

===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -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

===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -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):

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/276daa991c25576cd8e4cc2935955fe29f4...

--- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/276daa991c25576cd8e4cc2935955fe29f4... You're receiving this email because of your account on dev.gajim.org.