adjust versioning scheme

This commit is contained in:
ndparker 2015-03-03 18:26:49 +01:00
parent 218097ede6
commit fea207ca7f
2 changed files with 4 additions and 4 deletions

View File

@ -368,13 +368,13 @@ def run(config=('package.cfg',), ext=None, script_args=None, manifest_only=0):
keywords = keywords.split()
revision = pkg.get('version.revision', '').strip()
if revision:
revision = "-r%s" % (revision,)
revision = int(revision)
kwargs = {
'name': pkg['name'],
'version': "%s%s" % (
pkg['version.number'],
["", "-dev%s" % (revision,)][_util.humanbool(
["", ".dev%d" % (revision,)][_util.humanbool(
'version.dev', pkg.get('version.dev', 'false')
)],
),

View File

@ -369,13 +369,13 @@ def run(config=('package.cfg',), ext=None, script_args=None, manifest_only=0):
keywords = keywords.split()
revision = pkg.get('version.revision', '').strip()
if revision:
revision = "-r%s" % (revision,)
revision = int(revision)
kwargs = {
'name': pkg['name'],
'version': "%s%s" % (
pkg['version.number'],
["", "-dev%s" % (revision,)][_util.humanbool(
["", ".dev%d" % (revision,)][_util.humanbool(
'version.dev', pkg.get('version.dev', 'false')
)],
),