Signed-off-by: Matt Darfeuille <matd...@gmail.com>
---
build/release | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/build/release b/build/release
index c8500e71..8db88dde 100644
--- a/build/release
+++ b/build/release
@@ -127,8 +127,8 @@ checkout_branch_auto_func()
{
CURRENT_BRANCH_NAME=$(git --git-dir=${1}/.git rev-parse --abbrev-ref HEAD)
- if git --git-dir=${1}/.git show-ref --quiet --verify --
"refs/heads/$(printf "%.5s" $VERSION)"; then
- BRANCH_NAME=$(printf "%.5s" $VERSION)
+ if git --git-dir=${1}/.git show-ref --quiet --verify --
"refs/heads/$BASEVERSION"; then
+ BRANCH_NAME=$BASEVERSION
if [ $CURRENT_BRANCH_NAME != $BRANCH_NAME ]; then
echo "Checking out branch ${BRANCH_NAME}in ${1}/.git..."
@@ -284,6 +284,15 @@ done
VERSION=$1
+case $VERSION in
+ 5.1.[0-9][0-9]*)
+ BASEVERSION=$(printf "%.6s" $VERSION)
+ ;;
+ *)
+ BASEVERSION=$(printf "%.5s" $VERSION)
+ ;;
+esac
+
if [ -n "$MESSAGE" ]; then
[ -n "$APPEND_VERSION" ] && MESSAGE="$MESSAGE $VERSION"
fi
@@ -317,7 +326,14 @@ else
fi
if [ -n "$EXECUTE_UPLOAD_SCRIPT" ]; then
- [ -f $TOOLSDIR/upload ] && $TOOLSDIR/upload $VERSION
+ case $VERSION in
+ *[bB]ase*)
+ [ -f $TOOLSDIR/upload ] && $TOOLSDIR/upload $BASEVERSION
+ ;;
+ *)
+ [ -f $TOOLSDIR/upload ] && $TOOLSDIR/upload $VERSION
+ ;;
+ esac
fi
if [ -n "$PUSH_TAG" ]; then
--
2.13.2
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Shorewall-devel mailing list
Shorewall-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
