From f419e748487a9cb3d3bc9328c72c0793bc535123 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Feb 25 2020 13:11:48 +0000 Subject: source-to-tarball: properly set release in case of tagged release --- diff --git a/roles/source-to-tarball/files/detect-source-version.py b/roles/source-to-tarball/files/detect-source-version.py index 4a1b3b8..30a2525 100755 --- a/roles/source-to-tarball/files/detect-source-version.py +++ b/roles/source-to-tarball/files/detect-source-version.py @@ -35,8 +35,13 @@ def get_repo_version(repo): capture=True, cwd=repo, test=True).strip() # Make sure rev-list version is lower than first tag version = "0.0.0.0-0.dev%s" % version - version, release = version.replace('-g', 'g').split('-') - release = '0.%s%%{?dist}' % release + if '-' in version: + version, release = version.replace('-g', 'g').split('-') + release = '0.%s' % release + else: + # We are on the tag and version is such as 0.45.0 + release = '1' + release = '%s%%{?dist}' % release return json.dumps([version, release])