From 7732cb167dc53a8aba70a0293db6ab1c620cad9a Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@msavard.(none)>
Date: Wed, 5 Oct 2011 18:49:14 -0400
Subject: [PATCH] #7046: Fix launch-build-machine script for 1.X.X software
version
---
tools/build-system/launch-build-machine-2.sh | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/tools/build-system/launch-build-machine-2.sh b/tools/build-system/launch-build-machine-2.sh
index 0d9a44088f..85d0dd9e47 100755
--- a/tools/build-system/launch-build-machine-2.sh
+++ b/tools/build-system/launch-build-machine-2.sh
@@ -131,8 +131,8 @@ if [ ${IS_KDE_CLIENT} ]; then
PREVIOUS_VERSION=${PREVIOUS_RELEASE_TAG_NAME%.*}
PREVIOUS_VERSION=${PREVIOUS_VERSION#*.}
else
- CURRENT_RELEASE_VERSION=${CURRENT_RELEASE_TAG_NAME%.*}
- PREVIOUS_VERSION=${PREVIOUS_RELEASE_TAG_NAME%.*}
+ CURRENT_RELEASE_VERSION=${CURRENT_RELEASE_TAG_NAME}
+ PREVIOUS_VERSION=${PREVIOUS_RELEASE_TAG_NAME}
fi
cd ${LAUNCHPAD_DIR}
@@ -143,11 +143,7 @@ SOFTWARE_VERSION=""
LAUNCHPAD_CONF_PREFIX=""
if [ ${IS_RELEASE} ]; then
- VERSION_APPEND=""
- if [ "${CURRENT_RELEASE_TYPE}" != "stable" ] ; then
- VERSION_APPEND="~${CURRENT_RELEASE_TYPE}"
- fi
- SOFTWARE_VERSION="${CURRENT_RELEASE_VERSION}${VERSION_APPEND}"
+ SOFTWARE_VERSION="${CURRENT_RELEASE_VERSION}"
COMMIT_HASH_BEGIN="${PREVIOUS_RELEASE_COMMIT_HASH}"
LAUNCHPAD_CONF_PREFIX="sflphone"
else
--
GitLab