odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] migration: correct the verification of module version against running server 

bzr revid: chs@openerp.com-20140110162705-6vy67xbdje507bla
This commit is contained in:
Christophe Simonis 2014-01-10 17:27:05 +01:00
parent b7f393da31
commit a6b947d84b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openerp/modules/migration.py
View File

@ -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']))