From 93f6f3c4723d788b4ff5c7325e9a2bec3b15dd4d Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Mar 19 2020 11:17:46 +0000 Subject: source-to-tarball: fix failure due to multiple hyphen in branch name The algo logic expected a tag named such as "4.2.19" but fails if at least one hyphen is present like for such a tag "dnf-5-devel-branch-from-master". This patch fixes the misbehavior. --- diff --git a/roles/source-to-tarball/files/detect-source-version.py b/roles/source-to-tarball/files/detect-source-version.py index 0b61610..fb4c874 100755 --- a/roles/source-to-tarball/files/detect-source-version.py +++ b/roles/source-to-tarball/files/detect-source-version.py @@ -36,7 +36,7 @@ def get_repo_version(repo): # Make sure rev-list version is lower than first tag version = "0.0.0.0-0.dev%s" % version if '-' in version: - version, release = version.replace('-g', 'g').split('-') + version, release = version.replace('-g', 'g').split('-')[-2:] release = '0.%s' % release else: # We are on the tag and version is such as 0.45.0