Merge commit '08c2ef910f674c6' into xrg
bzr revid: p_christ@hol.gr-20090814170725-onsktz5xer5dztg0
This commit is contained in:
commit
4cc62acd96
|
@ -22,8 +22,7 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
name = 'openerp-server'
|
name = 'openerp-server'
|
||||||
version = '5.0.2'
|
version = '5.0.3-bzr'
|
||||||
release = '0'
|
|
||||||
major_version = '5.0'
|
major_version = '5.0'
|
||||||
description = 'OpenERP Server'
|
description = 'OpenERP Server'
|
||||||
long_desc = '''\
|
long_desc = '''\
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -46,8 +46,8 @@ opj = os.path.join
|
||||||
|
|
||||||
execfile(opj('bin', 'release.py'))
|
execfile(opj('bin', 'release.py'))
|
||||||
|
|
||||||
if sys.argv[1] != 'bdist_rpm':
|
if sys.argv[1] == 'bdist_rpm':
|
||||||
version = version + '-' + release
|
version = version.split('-')[0]
|
||||||
|
|
||||||
# get python short version
|
# get python short version
|
||||||
py_short_version = '%s.%s' % sys.version_info[:2]
|
py_short_version = '%s.%s' % sys.version_info[:2]
|
||||||
|
|
Loading…
Reference in New Issue