From a6b947d84b81bd14a51eae69a76aab785cd482c1 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 10 Jan 2014 17:27:05 +0100 Subject: [PATCH] [FIX] migration: correct the verification of module version against running server bzr revid: chs@openerp.com-20140110162705-6vy67xbdje507bla --- openerp/modules/migration.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openerp/modules/migration.py b/openerp/modules/migration.py index f199771ba61..132748d87da 100644 --- a/openerp/modules/migration.py +++ b/openerp/modules/migration.py @@ -30,6 +30,7 @@ from os.path import join as opj import openerp import openerp.release as release import openerp.tools as tools +from openerp.tools.parse_version import parse_version _logger = logging.getLogger(__name__) @@ -93,7 +94,7 @@ class MigrationManager(object): return def convert_version(version): - if version.startswith(release.major_version) and version != release.major_version: + if version.count('.') >= 2: return version # the version number already containt the server version return "%s.%s" % (release.major_version, version) @@ -135,8 +136,6 @@ class MigrationManager(object): a.update(b) return a - from openerp.tools.parse_version import parse_version - parsed_installed_version = parse_version(pkg.installed_version or '') current_version = parse_version(convert_version(pkg.data['version']))