openstack
/
fuel-mirror
Code Issues Proposed changes

[build] Ignore non-numerical tags 

Skip non-numerical git tags (like `liberty-eol`) on version detect

   Related-Bug: #1682851

Change-Id: I949269c7b46d7c088f5919a8de28359547704ae1
This commit is contained in:
Dmitry Burmistrov 2017-04-19 18:04:30 +04:00
parent dbeb65b270
commit 074d42c8c2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perestroika/build-deb.sh
View File

@ -32,7 +32,7 @@ main () {
TAR_NAME="${srcpackagename}_${version#*:}.orig.tar.gz"
if [ "$IS_OPENSTACK" == "true" ] ; then
# Get version number from the latest git tag for openstack packages
local release_tag=$(git -C $_srcpath describe --abbrev=0 --candidates=1)
local release_tag=$(git -C $_srcpath describe --abbrev=0 --candidates=1 --match "*[0-9]*")
# Deal with PyPi versions like 2015.1.0rc1
# It breaks version comparison
# Change it to 2015.1.0~rc1

2
perestroika/build-rpm.sh
View File

@ -39,7 +39,7 @@ This package provides the %{-n*} kernel modules
[ "`cat ${specfile} | grep -c '^%changelog'`" -eq 0 ] && echo "%changelog" >> ${specfile}
if [ "$IS_OPENSTACK" == "true" ] ; then
# Get version number from the latest git tag for openstack packages
local release_tag=$(git -C $_srcpath describe --abbrev=0 --candidates=1)
local release_tag=$(git -C $_srcpath describe --abbrev=0 --candidates=1 --match "*[0-9]*")
# Deal with PyPi versions like 2015.1.0rc1
# It breaks version comparison
# Change it to 2015.1.0~rc1