You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/19 00:02:09 UTC
git commit: updated refs/heads/master to 797a7f0
Repository: cloudstack
Updated Branches:
refs/heads/master b9dd67c38 -> 797a7f05f
use version in branchname if branch is master
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/797a7f05
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/797a7f05
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/797a7f05
Branch: refs/heads/master
Commit: 797a7f05fff190ebcb1e3a1a46fb5ac32936c295
Parents: b9dd67c
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jun 19 00:01:43 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 19 00:01:43 2015 +0200
----------------------------------------------------------------------
tools/build/build_asf.sh | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/797a7f05/tools/build/build_asf.sh
----------------------------------------------------------------------
diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh
index 45b07aa..025eec5 100755
--- a/tools/build/build_asf.sh
+++ b/tools/build/build_asf.sh
@@ -118,8 +118,13 @@ git clean -f
#create a RC branch
RELEASE_BRANCH="RC"`date +%Y%m%dT%H%M`
-git branch $branch-$RELEASE_BRANCH
-git checkout $branch-$RELEASE_BRANCH
+if [ "$branch" = "master" ]; then
+ BRANCHNAME=$version-$RELEASE_BRANCH
+else
+ BRANCHNAME=$branch-$RELEASE_BRANCH
+fi
+git branch $BRANCHNAME
+git checkout $BRANCHNAME
echo 'commit changes'
@@ -129,7 +134,7 @@ export commitsh=`git show HEAD | head -n 1 | cut -d ' ' -f 2`
echo "committed as $commitsh"
echo 'archiving'
-git archive --format=tar --prefix=apache-cloudstack-$version-src/ $branch-$RELEASE_BRANCH > $outputdir/apache-cloudstack-$version-src.tar
+git archive --format=tar --prefix=apache-cloudstack-$version-src/ $BRANCHNAME > $outputdir/apache-cloudstack-$version-src.tar
bzip2 $outputdir/apache-cloudstack-$version-src.tar
cd $outputdir