[IMP] move parse_version to tools directory
[IMP] release.py set major_version variable bzr revid: christophe@tinyerp.com-20081202164726-0d9d0gz89d6y7v2l
This commit is contained in:
parent
7d7743f1b0
commit
49c441b3a4
|
@ -35,7 +35,7 @@ import addons
|
|||
import pooler
|
||||
import netsvc
|
||||
|
||||
from parse_version import parse_version
|
||||
from tools.parse_version import parse_version
|
||||
|
||||
class module_repository(osv.osv):
|
||||
_name = "ir.module.repository"
|
||||
|
@ -53,7 +53,7 @@ class module_repository(osv.osv):
|
|||
}
|
||||
_defaults = {
|
||||
'sequence': lambda *a: 5,
|
||||
'filter': lambda *a: 'href="([a-zA-Z0-9_]+)-('+release.version.rsplit('.', 1)[0]+'.(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+))?)(\.zip)"',
|
||||
'filter': lambda *a: 'href="([a-zA-Z0-9_]+)-('+release.major_version+'.(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+))?)(\.zip)"',
|
||||
'active': lambda *a: 1,
|
||||
}
|
||||
_order = "sequence"
|
||||
|
@ -91,7 +91,7 @@ class module(osv.osv):
|
|||
data = f.read()
|
||||
info = eval(data)
|
||||
if 'version' in info:
|
||||
info['version'] = release.version.rsplit('.', 1)[0] + '.' + info['version']
|
||||
info['version'] = release.major_version + '.' + info['version']
|
||||
f.close()
|
||||
except:
|
||||
return {}
|
||||
|
@ -326,8 +326,7 @@ class module(osv.osv):
|
|||
|
||||
if not os.path.isfile( mod_path ):
|
||||
import imp
|
||||
# XXX must restrict to only addons paths
|
||||
path = imp.find_module(mod_name)
|
||||
path = imp.find_module(mod_name, [addons.ad, addons._ad])
|
||||
imp.load_module(name, *path)
|
||||
else:
|
||||
import zipimport
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
name = 'openerp-server'
|
||||
version = '5.0.0-rc1'
|
||||
major_version = version.rsplit('.', 1)[0]
|
||||
description = 'OpenERP Server'
|
||||
long_desc = '''\
|
||||
OpenERP is a complete ERP and CRM. The main features are accounting (analytic
|
||||
|
|
|
@ -92,7 +92,7 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None):
|
|||
idref2['time'] = time
|
||||
idref2['DateTime'] = DateTime
|
||||
import release
|
||||
idref2['version'] = release.version.rsplit('.', 1)[0]
|
||||
idref2['version'] = release.major_version
|
||||
idref2['ref'] = lambda x: self.id_get(cr, False, x)
|
||||
if len(f_model):
|
||||
idref2['obj'] = _obj(self.pool, cr, uid, f_model, context=context)
|
||||
|
|
|
@ -104,7 +104,7 @@ def init_db(cr):
|
|||
category_id, state) \
|
||||
values (%d, %s, %s, %s, %s, %s, %s, %d, %s)', (
|
||||
id, info.get('author', ''),
|
||||
release.version.rsplit('.', 1)[0] + '.' + info.get('version', ''),
|
||||
release.major_version + '.' + info.get('version', ''),
|
||||
info.get('website', ''), i, info.get('name', False),
|
||||
info.get('description', ''), p_id, state))
|
||||
dependencies = info.get('depends', [])
|
||||
|
|
Loading…
Reference in New Issue