From 276daa991c25576cd8e4cc2935955fe29f4141b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Fri, 24 Nov 2017 16:49:30 +0100 Subject: [PATCH] Correctly split version string We changed the version format --- gajim/common/optparser.py | 4 ++-- gajim/plugins/pluginmanager.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gajim/common/optparser.py b/gajim/common/optparser.py index 7438e4758..1eee125d0 100644 --- 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[^.=]+)(?:(?:\.(?P.+))?\.(?P[^.=]+))?\s=\s(?P.*)") @@ -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 diff --git a/gajim/plugins/pluginmanager.py b/gajim/plugins/pluginmanager.py index df7b5c342..15972955b 100644 --- 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):